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://git.lorimer.id.au/gitweb.git/diff_plain/87c15d1ca969e978fb8d04bc486a28025d71e6b2?ds=inline;hp=-c

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
diff --combined contrib/completion/git-completion.bash
index 5f556075d3,a45b4a0508..86b8f474c8
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1341,6 -1341,17 +1341,6 @@@ _git_checkout (
  	esac
  }
  
 -_git_cherry ()
 -{
 -	case "$cur" in
 -	--*)
 -		__gitcomp_builtin cherry
 -		return
 -	esac
 -
 -	__git_complete_refs
 -}
 -
  __git_cherry_pick_inprogress_options="--continue --quit --abort"
  
  _git_cherry_pick ()
@@@ -1822,7 -1833,7 +1822,7 @@@ _git_mergetool (
  		return
  		;;
  	--*)
- 		__gitcomp "--tool= --prompt --no-prompt"
+ 		__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
  		return
  		;;
  	esac