Skip to content

Instantly share code, notes, and snippets.

@krames
Created May 13, 2014 00:38
Show Gist options
  • Save krames/4e9a17ef49609b92e2a8 to your computer and use it in GitHub Desktop.
Save krames/4e9a17ef49609b92e2a8 to your computer and use it in GitHub Desktop.
[color]
ui = auto
[color "branch"]
current = yellow black
local = yellow
remote = magenta
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red reverse
new = green reverse
whitespace = white reverse
[color "status"]
added = yellow
changed = green
untracked = cyan reverse
branch = magenta
[user]
name = Kyle Rames
email = [email protected]
[core]
excludesfile = ~/.gitignore
quotepath = false
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[alias]
wsfix = !git diff HEAD >P.diff && git reset --hard HEAD && git apply --index --whitespace=fix P.diff && rm -f P.diff
wschk = !git diff --check HEAD
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment