summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Organov <sorganov@gmail.com>2014-08-29 17:51:46 +0400
committerJunio C Hamano <gitster@pobox.com>2014-09-16 11:27:12 -0700
commit95c68267ff84c02a97d0f2c18b4b4fbfee7a7fca (patch)
treedc6df0113d12ae96eb97b864571dbce0ba36e261
parent2d26d533a012f7475e13657d7fc829a6ba01db73 (diff)
downloadgit-95c68267ff84c02a97d0f2c18b4b4fbfee7a7fca.tar.gz
Documentation/git-rebase.txt: <upstream> must be given to specify <branch>so/rebase-doc
Current syntax description makes one wonder if there is any syntactic way to distinguish between <branch> and <upstream> so that one can specify <branch> but not <upstream>, but that is not the case. Make it explicit that these arguments are positional, i.e. the earlier ones cannot be omitted if you want to give later ones. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index f14100a160..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