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)
commit87c15d1ca969e978fb8d04bc486a28025d71e6b2
treeb15912a355fa5d3c487dca3e25c5d5723e283b6d
parent97ffca6cc74e5313a7d503f76fe2a99f13750c69
parentc217b9384e8ecbde866bfb09e88f1d7f87bc7b29
Merge branch 'dl/mergetool-gui-option'

"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
contrib/completion/git-completion.bash