Documentation/git-rebase.txt: <upstream> must be given to specify <branch>
authorSergey Organov <sorganov@gmail.com>
Fri, 29 Aug 2014 13:51:46 +0000 (17:51 +0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Sep 2014 18:27:12 +0000 (11:27 -0700)
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>
Documentation/git-rebase.txt
index f14100a16022306d280221b3cb1ae88f8c5498ce..4138554912165478d182d5720d4d7b4c4ab78c05 100644 (file)
@@ -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