5 # push/pull/diff/options
14 autosetuprebase = always
40 please = push --force-with-lease
43 diff = diff --word-diff
47 ai = add --interactive
49 f = "!git ls-files | grep -i"
56 amend = commit --amend
57 caa = commit -a --amend -C HEAD
58 fix = commit -a --fixup
61 ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
62 ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
63 lc = "!f() { git ll "$1"^.."$1"; }; f"
64 lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
67 lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
68 lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all
74 dlc = diff --cached HEAD^
75 dr = "!f() { git diff -w "$1"^.."$1"; }; f"
76 diffr = "!f() { git diff "$1"^.."$1"; }; f"
82 rh1 = reset HEAD^ --hard
83 rh2 = reset HEAD^^ --hard
88 svnl = svn log --oneline --show-commit
96 assume = update-index --assume-unchanged
97 unassume = update-index --no-assume-unchanged
99 assumed = "!git ls-files -v | grep ^h | cut -c 3-"
100 # unassume all the assumed files
101 unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
102 assumeall = "!git status -s | awk {'print $2'} | xargs git assume"
106 sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f"
108 sbu = "!f() { git subtree pull --prefix $2 $1 master --squash; }; f"
112 lasttag = "describe --tags --abbrev=0"
113 lt = "describe --tags --abbrev=0"
116 taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'"
119 ours = "!f() { git co --ours $@ && git add $@; }; f"
120 theirs = "!f() { git co --theirs $@ && git add $@; }; f"
123 rem="!git config -l | grep remote.*url | tail -n +2"
125 #apply patch from other local repo
126 lap = "!f() { git --git-dir=$1 format-patch -k -1 --stdout $2 | git am -3 -k; }; f"
128 #open markdown files edited in last commit
129 last = "!gvim $(git show HEAD --format="" --name-only | grep -e .*md$ | xargs)"
130 #open just created markdown in working directory
131 newmd = "!gvim $(git status -s | awk {'print $2'})"
133 # initial empty commit
134 empty = "!git commit -am\"[empty] Initial commit\" --allow-empty"
137 la = "!git config -l | grep alias | cut -c 7-"
139 # convoluted aliases {{{
140 # grep from root folder
141 gra = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f"
142 #rename branch tree to done-
143 done = "!f() { git branch | grep "$1" | cut -c 3- | grep -v done | xargs -I{} git branch -m {} done-{}; }; f"
144 #add bitbucket remote
145 ra = "!f() { git remote add $1 https://bitbucket.org/$2.git; }; f"
149 # undo from here http://megakemp.com/2016/08/25/git-undo/
150 undo = "!f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f"
153 serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git