Permalink
Switch branches/tags
Nothing to show
Find file
Fetching contributors…
Cannot retrieve contributors at this time
137 lines (117 sloc) 2.76 KB
[user]
name = Ben Burnett
email = ben.burnett@gmail.com
[alias]
a = add
aa = add --all
ae = add --edit
ai = add --interactive
ar = add-remove
amend = commit --amend -C HEAD
ap = add --patch
au = add --update
b = branch
c = commit
ca = commit --amend
cl = clone
changes = diff --name-status -r
co = checkout
cpc = cherry-pick
d = diff
ds = diff --staged
h = help
irb = rebase --interactive
l = log --graph --pretty=format:'%Cred%h%Creset %an -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative --decorate
#l = log --oneline --decorate
#lg = log --graph --pretty=format:'%Cred%h%Creset %an -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
ls-ignored = ls-files --exclude-standard --ignored --others
m = merge
mm = merge --no-ff
msg = commit --allow-empty -m
p = cherry-pick -s
r = remote
rb = rebase
rba = rebase --abort
rbc = rebase --continue
rbprune = "!for remote in `git remote`; do git remote prune $remote; done"
rbs = rebase --skip
rh = reset --hard
ru = remote update --prune
s = status -sb
sl = shortlog
sm = submodule
sma = submodule add
smu = submodule update --init
st = stash
stc = stash clear
stl = stash list
stp = stash pop
t = "!git checkout --track -b $1 ${2:-origin}/$1"
unadd = reset HEAD
ua = reset HEAD
undo = reset --soft HEAD^
wd = diff --color-words
wds = diff --color-words --staged
b2t = "!f() { git tag -m \"$2\" $1-TAG $1 && git branch -D $1; }; f"
t2r = "!f() { git branch ${1%-TAG} $1 && git tag -d $1; }; f"
conflicts = !git ls-files -u | cut -f 2 | sort -u
semtag = !git tag -a $(semver tag) -m \"tagging $(semver tag)\"
sv = !git tag -a $(semver tag) -m \"tagging $(semver tag)\"
[advice]
[apply]
whitespace = nowarn
[diff]
renames = copies
mnemonicprefix = true
[difftool]
prompt = false
[pager]
color = true
[branch]
autosetupmerge = true
autosetuprebase = always
[color]
ui = auto
[color "branch"]
current = green
local = yellow
remote = red
[advice]
pushNonFastForward = false
statusHints = false
[color "diff"]
meta = yellow
frag = magenta
old = red
new = green
[color "status"]
added = yellow
changed = green
frag = cyan
old = red
new = green
untracked = cyan
[push]
default = tracking
[help]
autocorrect = 0
[core]
editor = emacs
excludesfile = /Users/benner/.gitignore
whitespace = trailing-space,space-before-tab
quotepath = false
[rerere]
enabled = true
[merge]
stat = true
renamelimit = 3000
[diff "zip"]
textconv = unzip -c -a
[github]
user = versionsero
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true