From 980145f7470e20826ca22d7343494712eda9c81d Mon Sep 17 00:00:00 2001 From: Fernando Ramos Date: Wed, 30 Mar 2022 21:19:09 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- mergetools/kdiff3 | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'mergetools/kdiff3') diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index 520cb914a1..ee8b3a0570 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -4,6 +4,10 @@ diff_cmd () { "$LOCAL" "$REMOTE" >/dev/null 2>&1 } +diff_cmd_help () { + echo "Use KDiff3 (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -22,6 +26,10 @@ merge_cmd () { fi } +merge_cmd_help () { + echo "Use KDiff3 (requires a graphical session)" +} + exit_code_trustable () { true } -- cgit v1.2.3