Junio C Hamano 87c15d1ca9 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		2018-10-30 15:43:49 +09:00
..
.gitattributes	…
git-completion.bash	Merge branch 'dl/mergetool-gui-option'	2018-10-30 15:43:49 +09:00
git-completion.tcsh	…
git-completion.zsh	Merge branch 'sg/completion-zsh-workaround'	2018-06-13 12:50:45 -07:00
git-prompt.sh	git-prompt: fix reading files with windows line endings	2017-12-06 10:08:13 -08:00