[alias] co = checkout put = push origin HEAD push-all = "!for i in $(git config --list | grep -E ^remote\\..+\\.url | sed -E 's/^remote\\.(.*)\\.url=.*/\\1/'); do git push $i master; done" unadd = reset HEAD ctags = !.git/hooks/ctags [apply] whitespace = nowarn [color] branch = auto diff = auto status = auto ui = auto [core] attributesfile = ~/.gitattributes excludesfile = ~/.gitignore whitespace = fix [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] helper = osxkeychain [difftool "Kaleidoscope"] cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" [diff] tool = Kaleidoscope [difftool] prompt = false [mergetool "Kaleidoscope"] cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot [mergetool] prompt = false [merge] tool = Kaleidoscope