[user] name = Thomas Ruoff email = thomasr@brandwatch.com [color] branch = auto diff = auto interactive = auto status = auto [core] autocrlf = input editor=vim -f +1 -c start! autocrlf=input [alias] st = status co = checkout cm = commit br = branch llog = log --date=local changes = diff --name-status -r diffstat = diff --stat -r lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative fix = "!f() { ${EDITOR} $(git diff --name-only | uniq ); }; f" [merge] tool = bc3 [mergetool] cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED [push] default = current [giggle] main-window-maximized = false main-window-geometry = 1229x863+2049+127 main-window-view = FileView file-view-vpane-position = 304 file-view-hpane-position = 363 [gui] historybrowser = gitk [rebase] autosquash = true