.gitconfig

[user]
	email = <your email>
	name = <your name>
[gitreview]
	username = <your username>
[alias]
	newf = !bash -c 'git checkout -b feature/$0'
	uploadf = !bash -c 'git push origin `git rev-parse --abbrev-ref HEAD`'
	updatef = !bash -c 'git fetch && git merge master --no-ff'
	gof = !bash -c 'git checkout feature/$0'
	rmf = !bash -c 'git branch -d feature/$0'
	gohorse = !bash -c 'git add --all && git commit . && git push origin `git rev-parse --abbrev-ref HEAD`'
	branches = !legit branches
	graft = !legit graft
	harvest = !legit harvest
	publish = !legit publish
	unpublish = !legit unpublish
	sprout = !legit sprout
	sync = !legit sync
	switch = !legit switch
	ls = ls-files
	co = checkout
	ci = commit
	br = branch
	df = diff
	dc = diff --cached
	dm = diff | mate
	lg = log -p
	gl = git pull
	gp = git push
	st = status
        lok = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
	lol = log --graph --decorate --pretty=oneline --abbrev-commit
	lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
	tree = log --graph --simplify-by-decoration --pretty=format:'%d' --all
	# Show files ignored by git:
	ign = ls-files -o -i --exclude-standard
	#sync = remote prune origin
	unadd = reset HEAD --
	unstage = reset HEAD --
	uncommit = reset --soft HEAD~1
	newbranch = checkout -b
	new = !sh -c 'git log $1@{1}..$1@{0} "$@"'
	oops = reset --soft HEAD~1
	save = stash save
	pop = stash pop --index
	myinit = !sh -c 'git init && git commit -m \"Initial, empty commit\" --allow-empty' 
[push]
        default = simple
[apply]
	whitespace = nowarn
[color]
	ui = auto
[color "branch"]
	current = green
	local = normal
	remote = red
	plain = normal
[color "diff"]
	plain = normal
	meta = bold
	frag = cyan bold
	old = red bold
	new = green bold
	commit = yellow
[color "status"]
	header = normal
	added = blue
	updated = green
	changed = yellow
	untracked = cyan
	nobranch = red
[diff]
	external = git-diff-meld
[branch]
        autosetupmerge = true
[core]
	whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol

[merge]
	tool = diffmerge
[mergetool "diffmerge"]
	cmd = diffmerge --merge\n--result=$MERGED $LOCAL $BASE $REMOTE
	trustExitCode = true
[mergetool]
	keepBackup = false
[diff]
	tool = diffmerge
[difftool "diffmerge"]
	cmd = diffmerge $LOCAL $REMOTE