All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Documentation/git-rebase.txt: make it explicit in the syntax there is no way to specify <branch> without <upstream>.
@ 2014-08-29 13:51 Sergey Organov
  2014-09-16 18:26 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Sergey Organov @ 2014-08-29 13:51 UTC (permalink / raw)
  To: git; +Cc: gitster

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

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Documentation/git-rebase.txt: make it explicit in the syntax there is no way to specify <branch> without <upstream>.
  2014-08-29 13:51 [PATCH] Documentation/git-rebase.txt: make it explicit in the syntax there is no way to specify <branch> without <upstream> Sergey Organov
@ 2014-09-16 18:26 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2014-09-16 18:26 UTC (permalink / raw)
  To: Sergey Organov; +Cc: git

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.


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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-09-16 18:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-29 13:51 [PATCH] Documentation/git-rebase.txt: make it explicit in the syntax there is no way to specify <branch> without <upstream> Sergey Organov
2014-09-16 18:26 ` Junio C Hamano

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.