Michele Ballabio [off-list ref] writes:
+-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.
+
For the sake of brevity we say "up to date" in the error message from the
command, but for people who look up the manual to figure out why their
rebase is not rebasing with that error message, we may want to explain
what the phrase means in this context. E.g.
... even if the branch is a descendant of the commit you are
rebasing onto. Normally the command will exit with a message
"Current branch is up to date" in such a situation.
Words by Junio.
Signed-off-by: Michele Ballabio <redacted>
---
Documentation/git-rebase.txt | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 57bd333..276f151 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -258,6 +258,13 @@ 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 a descendant
+ of the commit you are rebasing onto. Normally the command will
+ exit with the message "Current branch is up to date" in such a
+ situation.
+
--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
Hi,
On Wed, 18 Mar 2009, Michele Ballabio wrote:
Words by Junio.
Okay, but who arranged it? And who wrote the melody in the first place?
Ciao,
Dscho
P.S.: :-)