From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Oct 2018 06:43:48 +0000 (+0900)
Subject: Merge branch 'dl/mergetool-gui-option'
X-Git-Tag: v2.20.0-rc0~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87c15d1ca969e978fb8d04bc486a28025d71e6b2;p=git

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
---

87c15d1ca969e978fb8d04bc486a28025d71e6b2