3 email = gitcommit@henk.geekmail.org
6 # always make new branches rebase on their tracking branch
7 autosetuprebase = always
9 # use (i)ndex, (w)orktree, (c)ommit, etc instead of a/ and b/
11 # detect renames and copies
13 # use different color for moved code (default == zebra, currently)
16 # delete tracking references and info about remote branches
17 # does not delete any branches
20 # show a lot of info by default
23 # show linenumber (-n)
26 # only do fastforward merges
29 # push to branch with same name on remote
32 # rebase, don’t merge, local changes
34 # only accept fastforwards by default
37 # when in a dirty worktree, automatically create a stash before and apply after rebasing
39 # automatically squash marked commits (squash! …, fixup! …)
42 # don’t use rerere to resolve merge conflicts
48 ai = add --interactive
60 cpa = cherry-pick --abort
61 cpc = cherry-pick --continue
65 cma = commit --all --message
66 cmv = commit --verbose
67 cmav = commit --all --verbose
68 amend = commit --amend
70 cam = commit --amend --message
71 can = commit --amend --no-edit
72 caa = commit --amend --all
73 cana = commit --amend --all --no-edit
74 fix = commit --all --fixup
76 diff = diff --word-diff
79 dlc = diff --cached HEAD^
81 dr = "!f() { git diff -w "$1"^.."$1"; }; f"
82 diffr = "!f() { git diff "$1"^.."$1"; }; f"
85 f = "!git ls-files | grep -i"
91 ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
92 ll = log --graph --topo-order --date=short --abbrev-commit --decorate --all --boundary --pretty=format:'%Cgreen%ad %Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue[%cn]%Creset %Cblue%G?%Creset'
93 lll = log --graph --topo-order --date=iso8601-strict --no-abbrev-commit --abbrev=40 --decorate --all --boundary --pretty=format:'%Cgreen%ad %Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue[%cn <%ce>]%Creset %Cblue%G?%Creset'
94 lc = "!f() { git ll "$1"^.."$1"; }; f"
95 lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
99 lg = log --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset" --abbrev-commit
100 lga = log --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset" --abbrev-commit --all
102 taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'"
108 please = push --force-with-lease
116 rbc = rebase --continue
117 rbi = rebase --interactive
123 rh1 = reset --hard HEAD^
124 rh2 = reset --hard HEAD^^
137 sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f"
138 # update/pull subtree
139 sbu = "!f() { git subtree pull --prefix $2 $1 master --squash; }; f"
141 # initial empty commit
142 empty = "!git commit -am\"[empty] Initial commit\" --allow-empty"
146 serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git