Last active
August 29, 2015 14:19
-
-
Save ypwu1/60f775e7a73a267c1505 to your computer and use it in GitHub Desktop.
Git Alias
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[alias] | |
a = add . | |
ai = add -i | |
ac = !git add . && git commit -am | |
############# | |
ap = apply | |
as = apply --stat | |
############# | |
ama = am --abort | |
amr = am --resolved | |
ams = am --skip | |
############# | |
b = branch | |
ba = branch -a | |
bd = branch -d | |
br = branch -r | |
############# | |
c = commit | |
ca = commit -a | |
cm = commit -m | |
cem = commit --allow-empty -m | |
cam = commit -am | |
cd = commit --amend | |
cad = commit -a --amend | |
ced = commit --allow-empty --amend | |
############# | |
d = diff | |
dc = diff --cached | |
dl = difftool | |
dlc = difftool --cached | |
dk = diff --check | |
dp = diff --patience | |
dck = diff --cached --check | |
############# | |
f = fetch | |
fo = fetch origin | |
############# | |
fp = format-patch | |
############# | |
fk = fsck | |
############# | |
g = grep -p | |
############# | |
l = log --oneline | |
lg = log --oneline --graph --decorate | |
############# | |
ls = ls-files | |
lsf = "!git ls-files | grep -i" | |
############# | |
m = merge | |
ma = merge --abort | |
mc = merge --continue | |
ms = merge --skip | |
############# | |
o = checkout | |
ob = checkout -b | |
############# | |
pr = prune -v | |
############# | |
ps = push | |
psf = push -f | |
psu = push -u | |
pso = push origin | |
psao = push --all origin | |
psfo = push -f origin | |
psuo = push -u origin | |
psom = push origin master | |
psfom = push -f origin master | |
psuom = push -u origin master | |
pushitgood = push -u origin --all | |
############# | |
pl = pull | |
plu = pull -u | |
plo = pull origin | |
plp = pull upstream | |
plom = pull origin master | |
plpm = pull upstream master | |
############# | |
pb = pull --rebase | |
pbo = pull --rebase origin | |
pbp = pull --rebase upstream | |
pbom = pull --rebase origin master | |
pbpm = pull --rebase upstream master | |
############# | |
rb = rebase | |
rba = rebase --abort | |
rbc = rebase --continue | |
rbi = rebase --interactive | |
rbs = rebase --skip | |
############# | |
re = reset | |
rh = reset HEAD | |
reh = reset --hard | |
rem = reset --mixed | |
res = reset --soft | |
rehh = reset --hard HEAD | |
remh = reset --mixed HEAD | |
resh = reset --soft HEAD | |
############# | |
r = remote | |
ra = remote add | |
rr = remote rm | |
rv = remote -v | |
rp = remote prune | |
rs = remote show | |
rao = remote add origin | |
rso = remote show origin | |
rpo = remote prune origin | |
############# | |
s = status | |
sb = status -s -b | |
############# | |
sa = stash apply | |
sc = stash clear | |
sd = stash drop | |
sl = stash list | |
sp = stash pop | |
ss = stash save | |
sw = stash show | |
############# | |
w = show | |
wp = show -p | |
wr = show -p --no-color | |
############# | |
svnr = svn rebase | |
svnd = svn dcommit | |
svnl = svn log --oneline --show-commit | |
############# | |
assume = update-index --assume-unchanged | |
unassume = update-index --no-assume-unchanged | |
assumed = "!git ls-files -v | grep ^h | cut -c 3-" | |
unassumeall = !git assumed | xargs git update-index --no-assume-unchanged | |
assumeall = "!git st -s | awk {'print $2'} | xargs git assume" | |
############# | |
ours = "!f() { git checkout --ours $@ && git add $@; }; f" | |
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" | |
############# | |
whois = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -" | |
whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short | |
############# | |
barebranch = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' - | |
flat = clone --depth 1 | |
subpull = !git submodule foreach git pull --tags origin master | |
subrepo = !sh -c 'filter-branch --prune-empty --subdirectory-filter $1 master' - | |
human = name-rev --name-only --refs=refs/heads/* | |
serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git | |
snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}" | |
############# | |
lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all | |
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all | |
[mergetool "sourcetree"] | |
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" | |
trustExitCode = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment