kernel/git - git - PowerEL Git System

Commit Graph

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
Bill Ritcher	6ceb658c99	mergetools: add support for guiffy Add guiffy as difftool and mergetool guiffy is available on Windows, Linux, and MacOS Signed-off-by: Bill Ritcher <Bill_Ritcher@guiffy.com> Reviewed-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2018-04-06 08:11:39 +09:00

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

Bill Ritcher

6ceb658c99

mergetools: add support for guiffy

Add guiffy as difftool and mergetool

guiffy is available on Windows, Linux, and MacOS

Signed-off-by: Bill Ritcher <Bill_Ritcher@guiffy.com>
Reviewed-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2018-04-06 08:11:39 +09:00

2 Commits (331f20d52df2fd5eb4bea4a9e14a368472f32819)