From: Sergey Organov <sorganov@gmail.com>
Date: Fri, 29 Aug 2014 13:51:46 +0000 (+0400)
Subject: Documentation/git-rebase.txt: <upstream> must be given to specify <branch>
X-Git-Tag: v2.1.2~7^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95c68267ff84c02a97d0f2c18b4b4fbfee7a7fca;p=thirdparty%2Fgit.git

Documentation/git-rebase.txt: <upstream> must be given to specify <branch>

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>
---

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