Re: [PATCH] git-merge: mutually match SYNOPSIS and "usage".

2014-10-08 Thread Sergey Organov
Junio C Hamano writes: > Sergey Organov writes: > >> Junio C Hamano writes: >> ... >> I was looking at the merge.c code, and that's how it seems to work. You >> can get new semantics without -m, and you can't get old semantics with >> -m, isn't it? It looks like the set of descriptions I produc

Re: [PATCH] git-merge: mutually match SYNOPSIS and "usage".

2014-10-07 Thread Junio C Hamano
Sergey Organov writes: > Junio C Hamano writes: > ... > I was looking at the merge.c code, and that's how it seems to work. You > can get new semantics without -m, and you can't get old semantics with > -m, isn't it? It looks like the set of descriptions I produced is > formally correct. The th

Re: [PATCH] git-merge: mutually match SYNOPSIS and "usage".

2014-10-07 Thread Sergey Organov
Junio C Hamano writes: > Sergey Organov writes: > >> SYNOPSIS section of the git-merge manual page had outdated explicit >> list of options. >> >> "usage" returned by 'git merge -h' didn't have "-m " that is one >> of essential distinctions between obsolete invocation form and the >> recent one.

Re: [PATCH] git-merge: mutually match SYNOPSIS and "usage".

2014-10-07 Thread Junio C Hamano
Sergey Organov writes: > SYNOPSIS section of the git-merge manual page had outdated explicit > list of options. > > "usage" returned by 'git merge -h' didn't have "-m " that is one > of essential distinctions between obsolete invocation form and the > recent one. > > Signed-off-by: Sergey Organov

[PATCH] git-merge: mutually match SYNOPSIS and "usage".

2014-10-07 Thread Sergey Organov
SYNOPSIS section of the git-merge manual page had outdated explicit list of options. "usage" returned by 'git merge -h' didn't have "-m " that is one of essential distinctions between obsolete invocation form and the recent one. Signed-off-by: Sergey Organov --- Documentation/git-merge.txt | 6