martinsam
6/14/2016 - 3:33 PM

gitconfig

[filter "lfs"]
	clean = git-lfs clean %f
	smudge = git-lfs smudge %f
	required = true
[user]
	name = Samuel Martin
	email = martin.sam@gmail.com
[user]
	name = martinsam
	email = martin.sam@gmail.com
[color]
diff = auto
status = auto
branch = auto
[alias]
st = status
ci = commit
co = checkout
fp = format-patch
lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset' --abbrev-commit --date=relative
prev = checkout HEAD^1
next = "!sh -c 'git log --reverse --pretty=%H master | awk \"/$(git rev-parse HEAD)/{getline;print}\" | xargs git checkout'"
[core]
pager = cat
	editor = vim
[merge]
	tool = diffmerge


[push]
	default = simple
[credential]
	helper = store
[diff]
	tool = diffmerge
[difftool "diffmerge"]
	cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[mergetool "diffmerge"]
	cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
	trustExitCode = true