gitconfig

[merge]
        tool = ediff
[mergetool "ediff"]
        cmd = ediff-merge.sh $BASE $LOCAL $REMOTE $MERGED
        trustExitCode = true
[mergetool]
        prompt = false
        keepBackup = false

[alias]
        br = branch -vv
        ci = commit
        cia = commit -a
        ciaa = commit -a --amend -C HEAD
        co = checkout
        dif = diff HEAD
        pr = !sh -c 'git-pull-rev.sh $1' -
        rs = !sh -c 'git-rebase-single-rev.sh $*' -
        set-ref = !sh -c 'git-set-ref.sh $1 $2 $3' -
        rmerge = !sh -c 'git-rebase-merge.sh $*' -
        brup = !sh -c 'git-branch-upstream.sh $*' -

#       facebook-specific aliases
        frdc = !sh -c 'git-fetch-rebase-dc.sh $1' -
        postdiff = !sh -c 'git-postdiff-dc.sh $1' -
        shove = !sh -c 'git-shove.sh $1' -
        fsl = log --graph --pretty=format:'%C(bold cyan)%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(red)<%an>%Creset' --abbrev-commit --all

[user]
        name = Tony Tung
        email = tonytung@merly.org
[core]
        excludesfile = /Users/tonytung/.gitignore
[color]
        ui = auto
[branch]
        autosetuprebase = always
[diff]
        ignoreSubmodules = untracked
[init]
	defaultBranch = trunk
[push]
	autoSetupRemote = true
[rebase]
	updateRefs = true