user/sven/git.git/mergetools/guiffy, branch master Git https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=master 2022-04-03T22:10:04Z mergetools: add description to all diff/merge tools 2022-04-03T22:10:04Z Fernando Ramos greenfoo@u92.eu 2022-03-30T19:19:09Z urn:sha1:980145f7470e20826ca22d7343494712eda9c81d 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> mergetools: add support for guiffy 2018-04-05T23:11:39Z Bill Ritcher Bill_Ritcher@guiffy.com 2018-04-05T13:55:01Z urn:sha1:6ceb658c9905cad2436810370c6590fc260a6b64 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>