Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] Documentation/git-rebase.txt: make it explicit in the syntax there is no way to specify <branch> without <upstream>.

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:02:32

Sergey Organov [off-list ref] writes:
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>. The change makes it explicit that these
arguments are in fact positional.
Makes sense.
Thanks.

quoted hunk
Signed-off-by: Sergey Organov <redacted>
---
 Documentation/git-rebase.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index f14100a..4138554 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help