2012-04-19 14:23:13 +00:00
|
|
|
[user]
|
2012-11-12 19:55:25 +00:00
|
|
|
name = Michael Campagnaro
|
|
|
|
|
email = mikecampo@gmail.com
|
2013-04-21 23:36:08 +00:00
|
|
|
[merge]
|
|
|
|
|
summary = true
|
2013-05-08 02:34:57 +00:00
|
|
|
tool = vimdiff
|
|
|
|
|
[core]
|
|
|
|
|
editor = /usr/bin/vim
|
|
|
|
|
[push]
|
|
|
|
|
default = tracking
|
|
|
|
|
[github]
|
|
|
|
|
user = mikecampo
|
|
|
|
|
[diff]
|
|
|
|
|
algorithm = patience
|
2012-04-19 14:23:13 +00:00
|
|
|
[color]
|
2013-04-21 23:36:08 +00:00
|
|
|
diff = auto
|
|
|
|
|
status = auto
|
|
|
|
|
branch = auto
|
|
|
|
|
interactive = auto
|
|
|
|
|
ui = true
|
|
|
|
|
pager = true
|
|
|
|
|
[color "branch"]
|
|
|
|
|
current = yellow reverse
|
|
|
|
|
local = yellow
|
|
|
|
|
remote = green
|
|
|
|
|
[color "diff"]
|
|
|
|
|
meta = blue
|
|
|
|
|
frag = magenta
|
|
|
|
|
old = red
|
|
|
|
|
new = green
|
2012-04-19 14:23:13 +00:00
|
|
|
[alias]
|
2013-04-04 18:37:38 +00:00
|
|
|
b = branch
|
|
|
|
|
h = !git head
|
|
|
|
|
l = !git ll -25
|
2012-11-12 19:55:25 +00:00
|
|
|
p = push
|
2013-04-04 18:37:38 +00:00
|
|
|
r = reset
|
|
|
|
|
s = stash
|
|
|
|
|
x = reset --hard
|
|
|
|
|
sl = stash list
|
|
|
|
|
sp = stash pop
|
|
|
|
|
sd = stash drop
|
|
|
|
|
sa = stash apply
|
2013-04-21 23:36:08 +00:00
|
|
|
st = status -s -b
|
2012-11-12 19:55:25 +00:00
|
|
|
ci = commit
|
2013-04-04 18:37:38 +00:00
|
|
|
cp = cherry-pick
|
2012-11-12 19:55:25 +00:00
|
|
|
co = checkout
|
2013-04-21 23:36:08 +00:00
|
|
|
d = diff
|
2012-11-12 19:55:25 +00:00
|
|
|
dc = diff --cached
|
2013-04-21 23:36:08 +00:00
|
|
|
ds = diff --staged
|
|
|
|
|
dw = diff --color-words
|
|
|
|
|
ae = commit --amend
|
2012-11-12 19:55:25 +00:00
|
|
|
aa = add --all
|
|
|
|
|
head = !git l -1
|
|
|
|
|
hp = "!source ~/.githelpers && show_git_head"
|
|
|
|
|
re = remote
|
|
|
|
|
ra = !git r --all
|
|
|
|
|
ff = merge --ff-only
|
2012-12-14 17:06:51 +00:00
|
|
|
pff = pull --ff-only
|
2012-11-12 19:55:25 +00:00
|
|
|
noff = merge --no-ff
|
2013-04-04 18:37:38 +00:00
|
|
|
la = !git ll --all
|
|
|
|
|
ll = "!source ~/.githelpers && pretty_git_log"
|
2012-11-12 19:55:25 +00:00
|
|
|
div = divergence
|
|
|
|
|
gn = goodness
|
|
|
|
|
gnc = goodness --cached
|
|
|
|
|
fa = fetch --all
|
|
|
|
|
pom = push origin master
|
|
|
|
|
ds = diff --stat=160,120
|
|
|
|
|
dh1 = diff HEAD~1
|
2013-05-08 02:34:57 +00:00
|
|
|
snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
|
|
|
|
|
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
|
|
|
|
|
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
|
