threads / patch / 37578

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

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

## tl;dr

2 messages between Aug 29, 2014 and Sep 16, 2014. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Sergey Organov· Aug 29, 2014, 13:51 UTC · lore

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.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
---
 Documentation/git-rebase.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to Documentation/git-rebase.txt +1 −1

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

-- 
1.9.3

Junio C Hamano· Sep 16, 2014, 18:26 UTC · re: Sergey Organov · lore

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

Sergey Organov <sorganov@gmail.com> 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.

Show 19 quoted lines

>
> Signed-off-by: Sergey Organov <sorganov@gmail.com>
> ---
>  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