2014-04-19 13:25:29 -04:00
|
|
|
[user]
|
|
|
|
|
name = Austen
|
|
|
|
|
email = stonewareslord@gmail.com
|
|
|
|
|
[alias]
|
2014-06-08 20:52:22 -04:00
|
|
|
i = "!git br&&git st"
|
2014-05-30 12:45:50 -04:00
|
|
|
pul = pull
|
|
|
|
|
pus = push --all
|
2014-04-19 13:25:29 -04:00
|
|
|
co = checkout
|
|
|
|
|
ci = commit -m
|
|
|
|
|
a = add
|
|
|
|
|
st = status
|
2014-05-17 14:09:38 -04:00
|
|
|
br = branch -av
|
2014-05-27 19:36:53 -04:00
|
|
|
hist = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit
|
2014-04-19 13:25:29 -04:00
|
|
|
type = cat-file -t
|
|
|
|
|
dump = cat-file -p
|
2014-06-16 18:58:00 -04:00
|
|
|
d = difftool
|
2014-06-28 02:16:07 -04:00
|
|
|
cbranch = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' -
|
2014-04-19 13:25:29 -04:00
|
|
|
[push]
|
2014-06-16 18:58:00 -04:00
|
|
|
default = matching
|
2014-04-19 13:25:29 -04:00
|
|
|
[core]
|
|
|
|
|
excludesfile = /home/stonewareslord/.gitignore_global
|
|
|
|
|
[diff]
|
2014-06-16 18:58:00 -04:00
|
|
|
tool = vimdiff
|
2014-04-19 13:25:29 -04:00
|
|
|
[difftool]
|
2014-06-16 18:58:00 -04:00
|
|
|
prompt = false
|
2014-04-19 13:25:29 -04:00
|
|
|
[merge]
|
|
|
|
|
tool = diffconflicts
|
|
|
|
|
[mergetool "diffconflicts"]
|
|
|
|
|
cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED
|
|
|
|
|
trustExitCode = true
|
|
|
|
|
keepBackup = false
|
|
|
|
|
[http]
|
|
|
|
|
sslVerify = false
|
