RE: merge --no-ff is NOT mentioned in help

2016-11-18 Thread Vanderhoof, Tzadik
> On Thu, Nov 17, 2016 at 09:10:22AM -0800, Junio C Hamano wrote: > > > People interested may want to try the attached single-liner patch to > > see how the output from _ALL_ commands that use parse-options API > > looks when given "-h". It could be that the result may not be too > > bad. > >

Re: merge --no-ff is NOT mentioned in help

2016-11-17 Thread Jeff King
On Thu, Nov 17, 2016 at 09:10:22AM -0800, Junio C Hamano wrote: > People interested may want to try the attached single-liner patch to > see how the output from _ALL_ commands that use parse-options API > looks when given "-h". It could be that the result may not be too > bad. The output is less

Re: merge --no-ff is NOT mentioned in help

2016-11-17 Thread Torsten Bögershausen
On 17/11/16 18:10, Junio C Hamano wrote: Mike Rappazzo writes: (Please reply inline) Indeed ;-) On Wed, Nov 16, 2016 at 10:48 AM, Vanderhoof, Tzadik wrote: I am running:git version 2.10.1.windows.1 I typed: git merge -h and got: usage: git merge [] [...] or: git merge [] HEA

Re: merge --no-ff is NOT mentioned in help

2016-11-17 Thread Junio C Hamano
Mike Rappazzo writes: > (Please reply inline) Indeed ;-) > On Wed, Nov 16, 2016 at 10:48 AM, Vanderhoof, Tzadik > wrote: >> I am running:git version 2.10.1.windows.1 >> >> I typed: git merge -h >> >> and got: >> >> usage: git merge [] [...] >>or: git merge [] HEAD >>or: git merge

RE: merge --no-ff is NOT mentioned in help

2016-11-17 Thread Vanderhoof, Tzadik
-Original Message- From: Mike Rappazzo [mailto:rappa...@gmail.com] Sent: Wednesday, November 16, 2016 7:58 AM To: Vanderhoof, Tzadik Cc: git@vger.kernel.org Subject: Re: merge --no-ff is NOT mentioned in help >(Please reply inline) > >On Wed, Nov 16, 2016 at 10:48 AM, Vanderhoo

Re: merge --no-ff is NOT mentioned in help

2016-11-16 Thread Mike Rappazzo
ents (like '--ff'), there is an automatic counter argument with "no-" in there ('--no-ff') to disable the option. Maybe it would make sense to word the output to include both. > > -Original Message----- > From: Mike Rappazzo [mailto:rappa...@gmail.com] >

RE: merge --no-ff is NOT mentioned in help

2016-11-16 Thread Vanderhoof, Tzadik
ik Cc: git@vger.kernel.org Subject: Re: merge --no-ff is NOT mentioned in help On Wed, Nov 16, 2016 at 10:16 AM, Vanderhoof, Tzadik wrote: > When I do: "git merge -h" to get help, the option "--no-ff" is left out of > the list of options. I am running git version 2.10.0, and run

Re: merge --no-ff is NOT mentioned in help

2016-11-16 Thread Mike Rappazzo
On Wed, Nov 16, 2016 at 10:16 AM, Vanderhoof, Tzadik wrote: > When I do: "git merge -h" to get help, the option "--no-ff" is left out of > the list of options. I am running git version 2.10.0, and running git merge --help contains these lines: --ff When the merge resolves as