diff options
| author | Fernando Ramos <greenfoo@u92.eu> | 2022-03-30 21:19:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-04 00:10:04 +0200 |
| commit | 980145f7470e20826ca22d7343494712eda9c81d (patch) | |
| tree | f22fa347b6fc89395a0185fe1fb0f7eca0822f55 /mergetools/smerge | |
| parent | vimdiff: add tool documentation (diff) | |
| download | git-980145f7470e20826ca22d7343494712eda9c81d.tar.xz git-980145f7470e20826ca22d7343494712eda9c81d.zip | |
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>
Diffstat (limited to 'mergetools/smerge')
| -rw-r--r-- | mergetools/smerge | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/smerge b/mergetools/smerge index 9c2e6f6fd7..5410835a6b 100644 --- a/mergetools/smerge +++ b/mergetools/smerge @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED" } +diff_cmd_help () { + echo "Use Sublime Merge (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -10,3 +14,7 @@ merge_cmd () { "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED" fi } + +merge_cmd_help () { + echo "Use Sublime Merge (requires a graphical session)" +} |