]> git.ipfire.org Git - thirdparty/git.git/commit
mergetools: add description to all diff/merge tools
authorFernando Ramos <greenfoo@u92.eu>
Wed, 30 Mar 2022 19:19:09 +0000 (21:19 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2022 22:10:04 +0000 (15:10 -0700)
commit980145f7470e20826ca22d7343494712eda9c81d
treef22fa347b6fc89395a0185fe1fb0f7eca0822f55
parent7b5cf8be180940ce099c8413d02fb5707d900708
mergetools: add description to all diff/merge tools

The output of `git mergetool --tool-help` and `git difftool --tool-help`
only showed the `alias` of each available merge/diff tool.

It is not always obvious what tool these `aliases` end up using (ex:
`opendiff` runs `FileMerge` and `bc` runs `Beyond Compare`).

This commit adds a short description to each of them to help the user
identify the `alias` they want.

Signed-off-by: Fernando Ramos <greenfoo@u92.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
20 files changed:
mergetools/araxis
mergetools/bc
mergetools/codecompare
mergetools/deltawalker
mergetools/diffmerge
mergetools/diffuse
mergetools/ecmerge
mergetools/emerge
mergetools/examdiff
mergetools/guiffy
mergetools/kdiff3
mergetools/kompare
mergetools/meld
mergetools/opendiff
mergetools/p4merge
mergetools/smerge
mergetools/tkdiff
mergetools/tortoisemerge
mergetools/winmerge
mergetools/xxdiff