diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:49 +0900 |
| commit | 87c15d1ca969e978fb8d04bc486a28025d71e6b2 (patch) | |
| tree | b15912a355fa5d3c487dca3e25c5d5723e283b6d /t/t9601 | |
| parent | Merge branch 'js/mingw-load-sys-dll' (diff) | |
| parent | doc: document diff/merge.guitool config keys (diff) | |
| download | tgif-87c15d1ca969e978fb8d04bc486a28025d71e6b2.tar.xz | |
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
Diffstat (limited to 't/t9601')
0 files changed, 0 insertions, 0 deletions