diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:08:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:08:12 -0700 |
| commit | e7867e80f00bf54634a2e15abd762ac615c5b791 (patch) | |
| tree | a90cbde45e11212a580ee68a21a4023b10beef6f | |
| parent | 62b553cdd6cd41d60b3e0c6fe4a85a951712df97 (diff) | |
| parent | 95c68267ff84c02a97d0f2c18b4b4fbfee7a7fca (diff) | |
| download | git-e7867e80f00bf54634a2e15abd762ac615c5b791.tar.gz | |
Merge branch 'so/rebase-doc' into maint
* so/rebase-doc:
Documentation/git-rebase.txt: <upstream> must be given to specify <branch>
Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op
| -rw-r--r-- | Documentation/git-rebase.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 2a93c645bd..4138554912 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] - [<upstream>] [<branch>] + [<upstream> [<branch>]] 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] 'git rebase' --continue | --skip | --abort | --edit-todo @@ -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 |