.gitconfig

[user]
	name = Stanislav Krupoderov
	email = pashelper@gmail.com

[include]
	# include aliases
	path = ~/.gitalias

[apply]
	whitespace = fix
[push]
	default = simple
[branch]
	autosetupmerge = true
[merge]
	renameLimit = 999999
	tool = ediff
[mergetool]
	prompt = false
[mergetool.ediff]
	cmd = emacs -q --eval \" \
	(progn \
	(setq ediff-quit-hook 'kill-emacs) \
	(if (file-readable-p \\\"$BASE\\\") \
	(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \
	\\\"$BASE\\\" nil \\\"$MERGED\\\") \
	(ediff-merge-files \\\"$LOCAL\\\" \\\"$REMOTE\\\" nil \\\"$MERGED\\\")))\"

[color "diff-highlight"]
	oldNormal = red bold
	oldHighlight = red bold 52
	newNormal = green bold
	newHighlight = green bold 22
[pull]
	rebase = true
	ff = only
[rebase]
	autoStash = true
	autosquash = true
[color]
	ui = auto
[diff]
	tool = vimdiff
[difftool]
	prompt = false