diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:54:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:54:04 -0700 |
| commit | 067f86fe12d1d9a9a1a962f7d82b1e84adc3120a (patch) | |
| tree | 6aad13e241fabcf98342f329b98c449f01d441d6 /Documentation/git-rebase.txt | |
| parent | Merge branch 'sb/prepare-revision-walk-error-check' (diff) | |
| parent | Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op (diff) | |
| download | tgif-067f86fe12d1d9a9a1a962f7d82b1e84adc3120a.tar.xz | |
Merge branch 'so/rebase-doc'
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
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 2a93c645bd..f14100a160 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -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 |