config.txt

[alias]
	#Logging
	net = "log --graph --abbrev-commit --decorate --all --format=format:\"%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(dim white) - %an%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset)\""
	ls = "log --pretty=format:\"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]\" --decorate --numstat"

	#Stage files
	a = "add --all"
	ai = "add -i"
	ap = "add --patch"

	#Commiting
	ci = "commit -i"
	c = "!git commit && git changed"
	ca = "!git add --all && git c"
	cm = "commit --amend --no-edit"

	#Merging
	m = "merge --no-ff --no-edit"
	m- = "!f() { git checkout $1 && git pl && git m -; }; f"
	m-dev = "!git m- dev"
	m-master = "!git m- master"
	m-staging = "!git m- staging"
	m-dev = "!git checkout dev && git pl && git m -"
	m-master = "!git checkout master && git pl && git m -"
	m-staging = "!git checkout staging && git pl && git m -"
	ma = "!git add --all && git commit --no-edit"

	#Undo
	uf = "checkout HEAD --"
	u = "!git add --all && git reset --hard"

	#Temporary file ignoring
	lock = "update-index --assume-unchanged"
	unlock = "update-index --no-assume-unchanged"
	locked = "!git ls-files -v | grep ^h | cut -c 3-"
	unlock-all = "!git locked | xargs -n 1 git unlock"

	#Pull
	pl = "pull --rebase"

	#Push
	ph = "push"
	pha = "!git push origin dev:dev && git push origin master:master && git push --tags"
	phf = "push --force-with-lease"
	plf = "!git fetch --all && git reset --hard"

	#Other
	s = "status --short --branch"
	b = "checkout -b"
	co = "checkout"
	it = "!git init && git commit -m 'Initial commit' --allow-empty"
	aliases = "!git config --get-regexp '^alias\\.' | cut -c 7- | awk '{cmd = $1; $1 = \"\"; print cmd\"∞\"$0;}' | column -t -s '∞'"
	t = "tag"
	prev = "checkout -"
	br-list = "branch -vv"
	rao = "remote add origin"
	changed = "show --stat --oneline HEAD"