2013-01-19 13:18:29 +00:00
|
|
|
[hub]
|
|
|
|
|
protocol = https
|
|
|
|
|
[user]
|
|
|
|
|
name = Gregory Eremin
|
2014-08-08 11:08:55 +00:00
|
|
|
email = g@erem.in
|
|
|
|
|
signingkey = EC26E86C
|
2013-01-19 13:18:29 +00:00
|
|
|
[credential]
|
|
|
|
|
helper = osxkeychain
|
|
|
|
|
[alias]
|
|
|
|
|
co = checkout
|
|
|
|
|
br = checkout -b
|
2013-04-19 18:11:41 +00:00
|
|
|
ci = commit
|
2014-08-08 11:08:55 +00:00
|
|
|
cp = cherry-pick
|
2017-03-10 10:43:07 +00:00
|
|
|
st = stash
|
|
|
|
|
sp = stash pop
|
|
|
|
|
rim = rebase -i master
|
|
|
|
|
rih = rebase -i HEAD~5
|
|
|
|
|
rc = rebase --continue
|
|
|
|
|
ra = rebase --abort
|
2013-07-30 08:58:56 +00:00
|
|
|
undo = reset --soft HEAD^
|
2017-03-10 10:43:07 +00:00
|
|
|
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)'
|
2013-01-19 13:18:29 +00:00
|
|
|
[color]
|
|
|
|
|
diff = auto
|
|
|
|
|
status = auto
|
|
|
|
|
branch = auto
|
|
|
|
|
ui = true
|
|
|
|
|
[core]
|
|
|
|
|
excludesfile = ~/.gitignore
|
2013-06-23 09:06:21 +00:00
|
|
|
editor = vim
|
2017-03-10 10:43:07 +00:00
|
|
|
pager = diff-so-fancy | less --tabs=4 -R
|
2013-01-20 09:40:26 +00:00
|
|
|
[push]
|
2013-01-20 10:09:49 +00:00
|
|
|
default = current
|
2013-01-19 13:18:29 +00:00
|
|
|
[apply]
|
|
|
|
|
whitespace = nowarn
|
|
|
|
|
[mergetool]
|
|
|
|
|
keepBackup = false
|
2013-07-30 08:58:56 +00:00
|
|
|
prompt = false
|
2013-01-19 13:18:29 +00:00
|
|
|
[difftool]
|
|
|
|
|
prompt = false
|
|
|
|
|
[help]
|
|
|
|
|
autocorrect = 1
|
2013-04-19 18:11:41 +00:00
|
|
|
[achievement]
|
2014-08-08 11:08:55 +00:00
|
|
|
upload = true
|
2013-07-30 08:58:56 +00:00
|
|
|
[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
|
2014-08-08 11:08:55 +00:00
|
|
|
[filter "media"]
|
2017-03-10 10:43:07 +00:00
|
|
|
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
|
