.gitconfig

[push]
	default = current
[core]
	trustctime = false
	editor = vim
	filemode = false
	ignorecase = true
	autocrlf = true
[color]
	ui = true
[credential]
	helper = cache --timeout=3600
[mergetool]
	prompt = true
[mergetool "vsdiffmerge"]
	cmd = '"vsDiffMerge.exe"' "$REMOTE" "$LOCAL" "$BASE" "$MERGED" //m
	keepbackup = false
	trustexitcode = true
[alias]
	last = log -1 --stat
	lastbuild = describe --abbrev=0 --tags
	buildbefore = !sh -c 'git describe --abbrev=0 --tags $1' -
	cp = cherry-pick
	co = checkout
	cob = checkout -b
	cl = clone
	addtracked = !git ls-files -m --exclude-standard | xargs git add 
	adduntracked = !git ls-files --others --exclude-standard | xargs git add 
	rmuntracked = !git ls-files --others --exclude-standard | xargs rm
	rekuntracked = !git ls-files --others --exclude-standard | xargs git add && git commit -qm 'wipe untracked savepoint' && git reset head~1 --hard 
	ci = commit
	cia = commit -a
	ciat = !git addtracked & git cia
	ciatrm = !git ciat & git rmuntracked
	ciatrek = !git ciat & git rekuntracked
	st = status -sb
	br = branch
	unstage = reset HEAD --
	dc = diff --cached
	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --abbrev-commit --date=relative --all
	rollback = checkout HEAD
	rekt = !git add -A && git commit -qm 'wipe savepoint' && git reset head~1 --hard
	megarekt = reset HEAD --hard
	down = pull --rebase
	save = !git add -A && git commit -m 'SAVEPOINT'
    	wip = !git add -u && git commit -m "WIP" 
    	undo = reset HEAD~1 --mixed
	amend = commit -a --amend
	db = branch -d
	dbr = push origin --delete
	pm = push origin 
	cb = rev-parse --abbrev-ref HEAD
	pb = !"git show-branch | ack '\\*' | ack -v \"`git cb`\" | head -n1 | perl -ne 'print $1 if /\\[(.*?)\\]/'"
	changes = diff HEAD
	fc = diff-tree --no-commit-id --name-status -r
	unfuckMerge = checkout -m
	singleChanges = !sh -c 'git diff $1^ $1' -
	nopmerge = !sh -c 'git merge $1 --strategy=ours' -
	# Finds which branches have the commit
	has = branch --contains 
	# Lists all commits which changed a given file
	whichCommits = log --follow
[mergetool "kdiff3"]
	path = C:/Program Files/KDiff3/kdiff3.exe
	trustExitCode = false
[diff]
	guitool = kdiff3
[difftool "kdiff3"]
	path = C:/Program Files/KDiff3/kdiff3.exe
	trustExitCode = false