[hub] protocol = https [user] name = Gregory Eremin email = g@erem.in signingkey = EC26E86C [credential] helper = osxkeychain [alias] co = checkout br = checkout -b ci = commit cp = cherry-pick st = stash sp = stash pop rim = rebase -i master rih = rebase -i HEAD~5 rc = rebase --continue ra = rebase --abort undo = reset --soft HEAD^ reword = commit --amend -m last = for-each-ref --sort=-committerdate --count=10 refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) %(color:green)(%(committerdate:relative))%(color:reset) - %(color:blue)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname)' [color] diff = auto status = auto branch = auto ui = true [core] excludesfile = ~/.gitignore editor = vim pager = diff-so-fancy | less --tabs=4 -R [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 [filter "media"] required = true clean = git media clean %f smudge = git media smudge %f [filter "hawser"] clean = git hawser clean %f smudge = git hawser smudge %f required = true [filter "lfs"] clean = git lfs clean %f smudge = git lfs smudge %f required = true [url "ssh://git@github.com/"] insteadOf = https://github.com/ [color "diff-highlight"] oldNormal = red bold oldHighlight = red bold 52 newNormal = green bold newHighlight = green bold 22