]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d47ee0a 42943b9)
Merge branch 'tk/mergetool-gui-default-config'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Apr 2023 01:05:11 +0000 (18:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Apr 2023 01:05:11 +0000 (18:05 -0700)
"git mergetool" and "git difftool" learns a new configuration
guiDefault to optionally favor configured guitool over non-gui-tool
automatically when $DISPLAY is set.

* tk/mergetool-gui-default-config:
  mergetool: new config guiDefault supports auto-toggling gui by DISPLAY

1  2 
builtin/difftool.c patch | diff1 | diff2 | blob | history

diff --cc builtin/difftool.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.