[hub] protocol = https [user] name = Gregory Eremin email = magnolia_fan@me.com [credential] helper = osxkeychain [alias] co = checkout br = checkout -b st = status -sb ci = commit rd = rebase -i development rh = rebase -i HEAD~5 unstage = reset undo = reset --soft HEAD^ [color] diff = auto status = auto branch = auto ui = true [core] excludesfile = ~/.gitignore editor = vim [push] default = current [apply] whitespace = nowarn [mergetool] keepBackup = false prompt = false [difftool] prompt = false [help] autocorrect = 1 [achievement] upload = true [difftool "Kaleidoscope"] cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" [diff] tool = Kaleidoscope [mergetool "Kaleidoscope"] cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot trustExitCode = true [merge] tool = Kaleidoscope