2013-01-19 13:18:29 +00:00
|
|
|
[hub]
|
|
|
|
|
protocol = https
|
|
|
|
|
[user]
|
|
|
|
|
name = Gregory Eremin
|
|
|
|
|
email = magnolia_fan@me.com
|
|
|
|
|
[credential]
|
|
|
|
|
helper = osxkeychain
|
|
|
|
|
[alias]
|
|
|
|
|
co = checkout
|
|
|
|
|
br = checkout -b
|
|
|
|
|
st = status -sb
|
2013-04-19 18:11:41 +00:00
|
|
|
ci = commit
|
2013-07-20 06:11:49 +00:00
|
|
|
rd = rebase -i development
|
|
|
|
|
rh = rebase -i HEAD~5
|
2013-07-30 08:58:56 +00:00
|
|
|
unstage = reset
|
|
|
|
|
undo = reset --soft HEAD^
|
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
|
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]
|
|
|
|
|
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
|
