diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-09 14:16:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-09 14:16:17 -0700 |
| commit | 53fe031ef8167aa5a2d2d804524f4442cdc52658 (patch) | |
| tree | f791fafca81406aec677e6db6628ed5239776cdc /git-rebase.txt | |
| parent | 8a1433ae1d12e8d860cd3bb9ef4c41c035c7b920 (diff) | |
| download | git-htmldocs-53fe031ef8167aa5a2d2d804524f4442cdc52658.tar.gz | |
Autogenerated HTML docs for v2.1.0-127-g0c72b
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 2a93c645b..f14100a16 100644 --- a/git-rebase.txt +++ b/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 |