gitconfig

.gitconfig

[alias]
  st = status
  ci = commit
  br = branch
  co = checkout
  df = diff
  lg = log -p
  xlog = log --graph --decorate --pretty=oneline --abbrev-commit --all
  rlog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
  fetchpr = fetch upstream +refs/pull/*:refs/remotes/upstream/pr/*

[merge]
    tool = meld
    [mergetool "meld"]
	    cmd = meld $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE --output=$PWD/$MERGED