git config, the one that I use

.gitconfig

# http://git-scm.com/docs/git-config.html

[user]
	name = Juga Paazmaya
	email = [email protected]

[github]
	user = paazmaya

[ui]
	color = true

[color]
	ui = auto

[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green

[color "diff"]
	whitespace = red reverse
	meta = yellow bold
	frag = magenta bold
	old = red bold
	new = green bold

[color "status"]
	added = yellow
	changed = green
	untracked = cyan

[core]
	whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
	autocrlf = input
	excludesfile = /Users/paazmaya/.gitignore_global

[alias]
	st = status -sb
	ci = commit
	br = branch
	co = checkout
	df = diff
	dc = diff --cached
	dp = diff --patience
	lg = log -p
	lol = log --graph --decorate --pretty=oneline --abbrev-commit
	lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
	ls = ls-files
	pl = pull --rebase
	undo = reset --soft HEAD^
	count = !git shortlog -sn | sort
	alias = config --get-regexp 'alias.*'

	# Show files ignored by git:
	ign = ls-files -o -i --exclude-standard

[branch]
	autosetupmerge = true

[apply]
	whitespace = nowarn

[push]
	default = simple

[diff]
	algorithm = patience
	tool = meld
[difftool]
	prompt = false
[difftool "meld"]
	cmd = meld "$LOCAL" "$REMOTE"
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false

[i18n]
	commitEncoding = UTF-8
	logoutputencoding = UTF-8
[merge]
	keepBackup = false;
	tool = meld
[mergetool]
	prompt = false
[mergetool "meld"]
	cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false

[advice]
	objectNameWarning = false

[merge "ours"]
	driver = true

[pull]
	rebase = true
[commit]
	template = /Users/paazmaya/.stCommitMsg