Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments

2018-10-23 Thread David Aguilar
On Wed, Oct 24, 2018 at 02:10:14PM +0900, Junio C Hamano wrote: > Denton Liu writes: > > > Subject: Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments > > Other people may point it out, but s/Accept/accept/. > > > In line with how difftool accepts a

Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments

2018-10-23 Thread Denton Liu
On Wed, Oct 24, 2018 at 02:10:14PM +0900, Junio C Hamano wrote: > In mode_ok shell function, we seem to be prepared to deal with a > case where neither diff_mode nor merge_mode is true. Should this > codepath also be prepared to? > According to Documentation/git-mergetool--lib.txt, >Before

Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments

2018-10-23 Thread Junio C Hamano
Denton Liu writes: > Subject: Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments Other people may point it out, but s/Accept/accept/. > In line with how difftool accepts a -g/--[no-]gui option, make mergetool > accept the same option in order to use the `merge.guitool`

[PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments

2018-10-23 Thread Denton Liu
In line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the `merge.guitool` variable to find the default mergetool instead of `merge.tool`. Signed-off-by: Denton Liu Signed-off-by: Anmol Mago Signed-off-by: Brian Ho Signed-off-by: David