My gitconfig file

.gitconfig

[color]
	ui = true
[user]
	name = Federico Aloi
	email = federico.aloi@gmail.com
[alias]
	all = commit -a -m
	amend = commit --amend --no-edit
	adduntracked = !git add $(git ls-files -o --exclude-standard)
	discard = checkout --
	co = commit -m
	undo = checkout .
	showalias = config --get-regexp alias
	unstage = reset HEAD
	remove = config --global --unset
	update = pull --rebase origin master
	change = !git stash && git rebase -i $1^ && git stash pop
	continue = rebase --continue
	rename = commit --amend -m
	br = checkout -b
	mr = checkout master
	ch = checkout
	delbr = !git push --delete origin
	deploy = !git push origin +HEAD:staging/$(git rev-parse --abbrev-ref HEAD)
	logfiles = log --stat
	addnw = !git diff -w --no-color | git apply --cached --ignore-whitespace
	removeignored = !git rm -r --cached . && git add .
	undolast = reset --soft HEAD^
	deltag = !git tag -d $1 && git push --delete origin $1
	cl = clean -fd
[push]
	default = current
[merge]
	tool = meld
[mergetool "mymeld"]
	cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $BASE $REMOTE $MERGED
[mergetool]
	keepBackup = false
[core]
	autocrlf = input