salex89
4/4/2017 - 10:53 AM

Example gitconfig file. Sets up Meld on Windows for merging and diff, enables rerere and skips creating .orig files.

Example gitconfig file. Sets up Meld on Windows for merging and diff, enables rerere and skips creating .orig files.

[user]
	email = <email>
	name = Aleksandar Stojadinovic
[merge]
	tool = meld
[mergetool]
	keepBackup = false
[mergetool "meld"]
	trustExitCode = true
	path = C:\\Program Files (x86)\\Meld\\Meld.exe
	cmd = meld "$LOCAL" "$BASE" "$REMOTE" --auto-merge --output "$MERGED"
	trustExitCode = true
[diff]
	tool = meld
[difftool]
	prompt = false
[difftool "meld"]
	trustExitCode = true
	cmd = meld "$LOCAL" "$REMOTE"
[rerere]
	enabled = 1