.gitconfig

[user]
	name = YourName
	email = your.email@whatever.yay

[color]
	ui = auto

[core]
	editor = sublime -n -w
	excludesfile = /Users/YourName/.gitignore

[filter "media"]
	clean = git-media-clean %f
	smudge = git-media-smudge %f

[alias]
	# create a new branch
	br = branch

	# commit stuff
		;basic commit
		ci = commit
		;commit with a message
		cim = commit -m

	# track the other branch
	co = checkout

	# show me the diffs
	df = diff

	# push all recent commits
	pu = push

	# push only current branch
	pucur = push origin HEAD

	# Pull from master
	pom = pull origin master

	# show me the diff between the latest commit and the current state
	dilacur = !"git diff-index --quiet HEAD -- || clear; git diff --patch-with-stat"

	# log stuff
		;list commit history
		lol = log --graph --decorate --pretty=oneline --abbrev-commit
		lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
		slog = shortlog -sn

	# listing stuff
		;list branches
		lsbra = branch -a

		;list ignored files
		lsig = ls-files --other --ignored --exclude-standard

	# merge those branches
	mg = merge

	# reset stuff
		;soft reset
		ouch = reset --soft HEAD~1
		;hard reset
		rh = reset --hard

	# Add untracked, remove deleted, and show status
    adda = !git add -A && git status

	# give me the status
		st = status

	# Ignore a file completely from development cycles
		au = git update-index --assume-unchanged
		nau = git update-index --no-assume-unchanged

[branch]
	autosetupmerge = always
	autosetuprebase = always

[push]
	default = simple