diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-17 18:05:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-17 18:05:11 -0700 |
| commit | 9d8370d44547d69e0734e47bb1c38e7ccd3e5387 (patch) | |
| tree | 01064b081e8e6bc76487265cc349816197018824 /commit.c | |
| parent | d47ee0a5653441ae727e22b8985c517132c42d4c (diff) | |
| parent | 42943b950e12f2d3e56688ecef1b0502e162b436 (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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions