Re: [PATCH 2/6] Documentation/git-merge.txt: remove list of options from SYNOPSIS

[Sergey Organov]

Junio C Hamano  writes:

> sorga...@gmail.com writes:
>
>> From: Sergey Organov 
>>
>> This partial list of option is confusing as it lacks a lot of
>> available options. It also clutters the SYNOPSIS making differences
>> between forms of invocation less clear.
>>
>> Signed-off-by: Sergey Organov 
>> ---
>>  Documentation/git-merge.txt | 5 +
>>  1 file changed, 1 insertion(+), 4 deletions(-)
>>
>> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
>> index b758d55..90342eb 100644
>> --- a/Documentation/git-merge.txt
>> +++ b/Documentation/git-merge.txt
>> @@ -9,10 +9,7 @@ git-merge - Join two or more development histories together
>>  SYNOPSIS
>>  
>>  [verse]
>> -'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
>> -[-s ] [-X ] [-S[]]
>> -[--[no-]allow-unrelated-histories]
>> -[--[no-]rerere-autoupdate] [-m ] [...]
>> +'git merge' [options] [-m ] [...]
>>  'git merge'  HEAD ...
>>  'git merge' --abort
>
> Same comment as 1/6; as we'd hopefully be removing the deprecated
> form soonish, it would probably make sense to leave only two, i.e.
>
>   git merge [options] [...]
>   git merge --abort
>
> in synposis.

Same "yes" as in 1/6, obviously.

-- Sergey

Re: [PATCH 2/6] Documentation/git-merge.txt: remove list of options from SYNOPSIS

[Junio C Hamano]

sorga...@gmail.com writes:

> From: Sergey Organov 
>
> This partial list of option is confusing as it lacks a lot of
> available options. It also clutters the SYNOPSIS making differences
> between forms of invocation less clear.
>
> Signed-off-by: Sergey Organov 
> ---
>  Documentation/git-merge.txt | 5 +
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index b758d55..90342eb 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -9,10 +9,7 @@ git-merge - Join two or more development histories together
>  SYNOPSIS
>  
>  [verse]
> -'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
> - [-s ] [-X ] [-S[]]
> - [--[no-]allow-unrelated-histories]
> - [--[no-]rerere-autoupdate] [-m ] [...]
> +'git merge' [options] [-m ] [...]
>  'git merge'  HEAD ...
>  'git merge' --abort

Same comment as 1/6; as we'd hopefully be removing the deprecated
form soonish, it would probably make sense to leave only two, i.e.

git merge [options] [...]
git merge --abort

in synposis.

[PATCH 2/6] Documentation/git-merge.txt: remove list of options from SYNOPSIS

[sorganov]

From: Sergey Organov 

This partial list of option is confusing as it lacks a lot of
available options. It also clutters the SYNOPSIS making differences
between forms of invocation less clear.

Signed-off-by: Sergey Organov 
---
 Documentation/git-merge.txt | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index b758d55..90342eb 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -9,10 +9,7 @@ git-merge - Join two or more development histories together
 SYNOPSIS
 
 [verse]
-'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
-   [-s ] [-X ] [-S[]]
-   [--[no-]allow-unrelated-histories]
-   [--[no-]rerere-autoupdate] [-m ] [...]
+'git merge' [options] [-m ] [...]
 'git merge'  HEAD ...
 'git merge' --abort
 
-- 
2.10.0.1.g57b01a3