git.git - The core git plumbing

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>
2019-04-04	mergetools: add support for smerge (Sublime Merge)	David Aguilar	1	-0/+12
	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>