development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-12 03:22:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'so/rebase-doc'

Browse source 
May need further updates to the description to explain what makes
various modes of operation to decide that the request can become a
"no-op".

* so/rebase-doc:
  Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op
This commit is contained in:
Junio C Hamano 2014-09-09 12:54:03 -07:00
parent 715b63ceb3 2d26d533a0
commit 067f86fe12
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Documentation/git-rebase.txt
View file

@ -316,11 +316,8 @@ which makes little sense.
-f::
--force-rebase::
Force the rebase even if the current branch is a descendant
of the commit you are rebasing onto. Normally non-interactive rebase will
exit with the message "Current branch is up to date" in such a
situation.
Incompatible with the --interactive option.
Force a rebase even if the current branch is up-to-date and
the command without `--force` would return without doing anything.
+
You may find this (or --no-ff with an interactive rebase) helpful after
reverting a topic branch merge, as this option recreates the topic branch with