Permalink
Switch branches/tags
Nothing to show
Find file
Fetching contributors…
Cannot retrieve contributors at this time
67 lines (64 sloc) 2.22 KB
[user]
name = Noel Weichbrodt
email = nweichbrodt@opentable.com
signingkey = ********
[commit]
gpgsign = true
[github]
user = noelweichbrodt
toke = ******************************
[core]
whitespace = trailing-space,space-before-tab
autocrlf = false
[alias]
cam = !git add -A && git commit -m
cm = commit -m
amend = commit --amend -C HEAD
b = branch
bd = "!git branch --merged | grep -v \"*\" | xargs -n 1 git branch -d"
c = checkout
cb = checkout -b
changes = diff --name-status -r
check = "!git fetch; git log HEAD.. --oneline"
d1 = diff HEAD~1 HEAD
l = "!git log --graph --pretty='tformat:%C(yellow)%h{%C(green)%ar{%C(bold blue)%an{%C(red)%d%C(reset) %s' $* | column -t -s '{' | less -FXRS"
lc = "!f() { git log --author=$1 --graph --diff-filter=ACDMR --name-status --pretty --source --abbrev-commit --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %C(bold blue)<%an>%Creset'; }; f"
lf = log --graph --diff-filter=ACDMR --name-status --pretty --source --abbrev-commit --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
lg = log --graph --pretty=format:'%Cred%h%Creset %an -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
li = ls-files --exclude-standard --ignored --others
lr = log ORIG_HEAD.. --stat --no-merges
merge-dry = "!f() { git merge-tree `git merge-base $2 $1` $2 $1; }; f" #check how the merge of dev into master will go: git dry dev master
merge-wet = "!f() { git merge --no-commit --no-ff $1; }; f"
pl = checkout HEAD
po = push origin
pu = push -u origin
pr = checkout
pt = push --follow-tags
s = status
su = submodule update --init
undo = reset --soft HEAD^
unmaster = "!f() { git log HEAD ^$(git merge-base master HEAD) --no-merges $1; }; f"
yolo = !"git commit -am 'DEAL WITH IT' && git push -f origin master"
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[diff]
renames = copies
[merge]
stat = true
[advice]
pushNonFastForward = false
[push]
default = matching