gistfile1.txt

[user]
  ....
[core]
	editor = vim
    pager = less -R
[merge]
	tool = meld
[diff]
	tool = meld
[alias]
    cp = cherry-pick
	st = status
	mf = merge --ff-only
	co = checkout
	cob = checkout -b
	cm = commit -m
	br = branch
	cot = checkout -t
    pr = pull --rebase
    diverges = !bash -c 'diff -u <(git rev-list --first-parent "${1}") <(git rev-list --first-parent "${2:-HEAD}") | sed -ne \"s/^ //p\" | head -1' -
    df = diff
    lg = log -p
    up = !sh -c 'git pull --rebase --prune && git log --pretty=format:\"%Cred%ae %Creset- %C(yellow)%s %Creset(%ar)\" HEAD@{1}..'
    lol = log --graph --decorate --pretty=oneline --abbrev-commit
    lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
    ls = ls-files
[color]
    diff = auto
    branch = auto
    status = auto
    interactive = auto
    ui = auto
[push]
    default = current
[format]
#    pretty = oneline
[pull]
#	rebase = true
	default = current
[credential]
	helper = osxkeychain