mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-04 22:56:34 +02:00
Code
73,147 Commits 6 Branches 933 Tags 721 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Fernando Ramos 980145f747 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>
 2022-04-03 15:10:04 -07:00
David Aguilar eb12adc74c mergetools: add support for smerge (Sublime Merge) 
Teach difftool and mergetool about the Sublime Merge "smerge" command.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-04-04 18:21:25 +09:00