Andrew's git / gitweb.git / diff
?
Merge branch 'dl/mergetool-gui-option'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2018 06:43:48 +0000 (15:43 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2018 06:43:49 +0000 (15:43 +0900)
"git mergetool" learned to take the "--[no-]gui" option, just like
"git difftool" does.

* dl/mergetool-gui-option:
doc: document diff/merge.guitool config keys
completion: support `git mergetool --[no-]gui`
mergetool: accept -g/--[no-]gui as arguments

1  2 
contrib/completion/git-completion.bash patch | diff1 | diff2 | blob | history
diff --cc contrib/completion/git-completion.bash
Simple merge