3 email = gitcommit@henk.geekmail.org
4 signingKey = 0x1B7EADFDDF720123
7 # always make new branches rebase on their tracking branch
8 autosetuprebase = always
10 # show diff in commit message editor
13 # complain about tabs used for indenting
14 whitespace = tab-in-indent
16 # use (i)ndex, (w)orktree, (c)ommit, etc instead of a/ and b/
18 # detect renames and copies
20 # use different color for moved code (default == zebra, currently)
22 # use vimdiff as difftool
25 # do not prompt before invoking difftool
28 # delete tracking references and info about remote branches
29 # does not delete any branches
32 # show a lot of info by default
35 # show linenumber (-n)
38 # show short commit sha
40 # show short ref names but only in terminal
43 # use vimdiff as mergetool
46 compact = %C(auto)%h%Cgreen% cs%Cblue%<(15,trunc)% an%C(auto)%d%Creset% s
48 # push to branch with same name on remote
50 # also push reachable annotated tags
53 # rebase, don’t merge, local changes
55 # only accept fastforwards by default
58 # when in a dirty worktree, automatically create a stash before and apply after rebasing
60 # automatically squash marked commits (squash! …, fixup! …)
63 # don’t use rerere to resolve merge conflicts
69 ai = add --interactive
76 brav = branch --all --verbose --verbose
82 cpa = cherry-pick --abort
83 cpc = cherry-pick --continue
88 cam = commit --all --message
89 fix = commit --all --fixup
93 dlc = diff --cached HEAD^
95 dr = "!f() { git diff -w "$1"^.."$1"; }; f"
96 diffr = "!f() { git diff "$1"^.."$1"; }; f"
99 f = "!git ls-files | grep -i"
107 la = log --graph --all
108 lap = log --graph --all --patch
112 taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'"
118 please = push --force-with-lease
124 frbp = "!f() { git fetch; git rebase "$1"; git push --force-with-lease; }; f"
127 rbc = rebase --continue
128 rbi = rebase --interactive
134 rh1 = reset --hard HEAD^
135 rh2 = reset --hard HEAD^^
149 sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f"
150 # update/pull subtree
151 sbu = "!f() { git subtree pull --prefix $2 $1 master --squash; }; f"
153 # initial empty commit
154 empty = "!git commit -am\"[empty] Initial commit\" --allow-empty"
158 serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git