fboyer
12/22/2014 - 8:13 PM

Default .gitconfig with Sublime Text/Sublimerge

Default .gitconfig with Sublime Text/Sublimerge

[user]
	name = Frédéric Boyer
	email = fboyer@gmail.com

[credential]
	helper = osxkeychain

[color]
	ui = auto

[apply]
	whitespace = nowarn

[core]
	editor = subl -n -w

[merge]
	tool = sublimerge

[mergetool "sublimerge"]
	cmd = subl -n --wait \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\" --command \"sublimerge_diff_views\"
	trustExitCode = false

[diff]
	tool = sublimerge

[difftool "sublimerge"]
	cmd = subl -n --wait \"$REMOTE\" \"$LOCAL\" --command \"sublimerge_diff_views {\\\"left_read_only\\\": true, \\\"right_read_only\\\": true}\"