-
- Downloads
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>
Showing
- mergetools/araxis 8 additions, 0 deletionsmergetools/araxis
- mergetools/bc 8 additions, 0 deletionsmergetools/bc
- mergetools/codecompare 8 additions, 0 deletionsmergetools/codecompare
- mergetools/deltawalker 8 additions, 0 deletionsmergetools/deltawalker
- mergetools/diffmerge 8 additions, 0 deletionsmergetools/diffmerge
- mergetools/diffuse 8 additions, 0 deletionsmergetools/diffuse
- mergetools/ecmerge 8 additions, 0 deletionsmergetools/ecmerge
- mergetools/emerge 8 additions, 0 deletionsmergetools/emerge
- mergetools/examdiff 8 additions, 0 deletionsmergetools/examdiff
- mergetools/guiffy 8 additions, 0 deletionsmergetools/guiffy
- mergetools/kdiff3 8 additions, 0 deletionsmergetools/kdiff3
- mergetools/kompare 8 additions, 0 deletionsmergetools/kompare
- mergetools/meld 8 additions, 0 deletionsmergetools/meld
- mergetools/opendiff 8 additions, 0 deletionsmergetools/opendiff
- mergetools/p4merge 8 additions, 0 deletionsmergetools/p4merge
- mergetools/smerge 8 additions, 0 deletionsmergetools/smerge
- mergetools/tkdiff 8 additions, 0 deletionsmergetools/tkdiff
- mergetools/tortoisemerge 8 additions, 0 deletionsmergetools/tortoisemerge
- mergetools/winmerge 8 additions, 0 deletionsmergetools/winmerge
- mergetools/xxdiff 8 additions, 0 deletionsmergetools/xxdiff
Loading
Please register or sign in to comment