.gitconfig

.gitconfig

[credential]
	helper = osxkeychain
[core]
	excludesfile = ~/.gitexcludes
[branch]
	autosetuprebase = always
[alias]
  	rem = rebase origin/master
  	co = checkout
  	br = branch
  	ci = commit
  	st = status -s
  	unstage = reset HEAD --
  	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit
  	changes = diff --name-status -r 
        conflicts = diff --name-only --diff-filter=U
        diffstat = diff --stat -r
  	cb = rev-parse --abbrev-ref HEAD
  	update = "!git remote update -p; git merge --ff-only @{u}"
        search = "!f() { git grep -In $1 -- $2; }; f"
        tfo = reset --hard
        sync = push -u origin HEAD
[color]
  	diff = auto
	status = auto
	branch = auto
[diff]
	tool = diff
[difftool]
	prompt = false
[mergetool]
	prompt = false
[merge]
	tool = vimdiff

[rerere]
	enabled = true