git.git - The core git plumbing

Age	Commit message (Expand)	Author	Files	Lines
2024-02-19	mergetools: vimdiff: use correct tool's name when reading mergetool config	Kipras Melnikovas	1	-6/+13
2023-10-09	documentation: add some commas where they are helpful	Elijah Newren	1	-5/+5
2023-10-09	documentation: add missing words	Elijah Newren	1	-1/+1
2023-10-09	documentation: wording improvements	Elijah Newren	1	-1/+1
2023-04-05	mergetool: new config guiDefault supports auto-toggling gui by DISPLAY	Tao Klerks	1	-0/+7
2022-10-11	Merge branch 'nb/doc-mergetool-typofix'	Junio C Hamano	1	-1/+1
2022-10-05	mergetool.txt: typofix 'overwriten' -> 'overwritten'	Noah Betzen	1	-1/+1
2022-04-03	vimdiff: add tool documentation	Fernando Ramos	1	-0/+9
2021-03-13	mergetool: do not enable hideResolved by default	Jonathan Nieder	1	-1/+1
2021-02-09	mergetool: add per-tool support and overrides for the hideResolved flag	Seth House	1	-0/+5
2021-02-09	mergetool: add hideResolved configuration	Seth House	1	-0/+10
2020-09-16	mergetool: allow auto-merge for meld to follow the vim-diff behavior	Lin Sun	1	-0/+10
2018-10-29	config.txt: move mergetool.* to a separate file	Nguyễn Thái Ngọc Duy	1	-0/+53