| Age | Commit message (Collapse) | Author | Files | Lines | |
|---|---|---|---|---|---|
| 2022-04-03 | mergetools: add description to all diff/merge tools | Fernando Ramos | 1 | -0/+8 | |
| 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> | |||||
| 2018-04-06 | mergetools: add support for guiffy | Bill Ritcher | 1 | -0/+18 | |
| 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> | |||||
 |
index : git | |
| Mirror of https://git.kernel.org/pub/scm/git/git.git/ |
| aboutsummaryrefslogtreecommitdiffstats |