[PATCH 2/3] document --force-rebase
From: Michele Ballabio <hidden>
Date: 2016-06-15 22:46:25
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Signed-off-by: Michele Ballabio <redacted> --- Documentation/git-rebase.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 57bd333..6cb902a 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt@@ -258,6 +258,12 @@ OPTIONS context exist they all must match. By default no context is ever ignored. +-f:: +--force-rebase:: + Force the rebase even if the current branch is up to date. + Normally, if the current branch is up to date, the rebase is + aborted. + --whitespace=<option>:: This flag is passed to the 'git-apply' program (see linkgit:git-apply[1]) that applies the patch.
--
1.6.2.22.gc2ac