[include] path = ~/.gitconfig.user [core] excludesfile = ~/.gitignore editor = /Applications/MacVim.app/Contents/MacOS/Vim autocrlf = input eol = lf pager = less -FXRS -x2 [color] ui = auto [color "branch"] current = yellow reverse local = yellow remote = green [color "diff"] meta = yellow bold frag = magenta bold old = red bold new = green bold whitespace = red reverse [color "status"] added = yellow changed = green untracked = cyan [alias] git = !git cl = clean -f -d st = status cm = commit co = checkout br = branch -a ps = push pl = pull mg = merge rbc = rebase --continue ffs = flow feature start fff = flow feature finish ffp = flow feature publish fi = flow init unst = reset HEAD hub = push origin master fac = push origin refac rs = reset HEAD --hard hist = log --pretty=format:\"%h | %ad | %an | %s%d \" --graph --date=local l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit lo = log --graph --decorate --pretty=oneline --abbrev-commit --all pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master" type = cat-file -t dump = cat-file -p [diff] tool = vimdiff guitool = vimdiff [mergetool] prompt = false keepBackup = false [push] default = simple