]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit9d8370d44547d69e0734e47bb1c38e7ccd3e5387
tree01064b081e8e6bc76487265cc349816197018824tree | snapshot
parentd47ee0a5653441ae727e22b8985c517132c42d4ccommit | diff
parent42943b950e12f2d3e56688ecef1b0502e162b436commit | diff
Merge branch 'tk/mergetool-gui-default-config'

"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
builtin/difftool.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.