[alias] # Add file excluding whitespace changes (http://stackoverflow.com/a/7149602/56690) addnw = !sh -c 'git diff -w --no-color "$@" | git apply --cached --ignore-whitespace' - unadd = reset HEAD ctags = "!$(git rev-parse --show-toplevel)/.git/hooks/ctags" latest = for-each-ref --sort=-committerdate --format='%(committerdate:relative) -> %(refname:short)' lg = log --decorate --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative switch = !legit switch \"$@\" branches = !legit branches sprout = !legit sprout \"$@\" unpublish = !legit unpublish \"$@\" harvest = !legit harvest \"$@\" sync = !legit sync \"$@\" publish = !legit publish \"$@\" graft = !legit graft \"$@\" [apply] whitespace = fix [color] branch = auto diff = auto status = auto ui = auto [core] attributesfile = ~/.gitattributes excludesfile = ~/.gitignore whitespace = trailing-space,space-before-tab precomposeunicode = true editor = vim -u NONE +0 -c 'syntax on' [branch] autosetupmerge = always autosetuprebase = local [diff "ruby"] funcname = ^ *\\(\\(class\\|module\\|def\\) .*\\) [github] user = bjeanes [init] templatedir = ~/.git_template [rerere] enabled = 1 [include] path = .gitconfig.github path = .gitconfig.pushurls path = .gitconfig.merge path = .gitconfig.local [credential] username = bjeanes helper = osxkeychain [difftool "Kaleidoscope"] cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" [diff] algorithm = minimal mnemonicprefix = true tool = Kaleidoscope renames = copies [difftool] prompt = false [mergetool "Kaleidoscope"] cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot trustExitCode = true [mergetool] prompt = false [merge] conflictstyle = diff3 tool = Kaleidoscope