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 # only do fastforward merges
45 # use vimdiff as mergetool
48 compact = %C(auto)%h%Cgreen% cs%Cblue%<(15,trunc)% an%C(auto)%d%Creset% s
50 # push to branch with same name on remote
52 # also push reachable annotated tags
55 # rebase, don’t merge, local changes
57 # only accept fastforwards by default
60 # when in a dirty worktree, automatically create a stash before and apply after rebasing
62 # automatically squash marked commits (squash! …, fixup! …)
65 # don’t use rerere to resolve merge conflicts
71 ai = add --interactive
83 cpa = cherry-pick --abort
84 cpc = cherry-pick --continue
89 cam = commit --all --message
90 fix = commit --all --fixup
92 diff = diff --word-diff
95 dlc = diff --cached HEAD^
97 dr = "!f() { git diff -w "$1"^.."$1"; }; f"
98 diffr = "!f() { git diff "$1"^.."$1"; }; f"
101 f = "!git ls-files | grep -i"
108 la = log --graph --all
111 taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'"
117 please = push --force-with-lease
125 rbc = rebase --continue
126 rbi = rebase --interactive
132 rh1 = reset --hard HEAD^
133 rh2 = reset --hard HEAD^^
146 sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f"
147 # update/pull subtree
148 sbu = "!f() { git subtree pull --prefix $2 $1 master --squash; }; f"
150 # initial empty commit
151 empty = "!git commit -am\"[empty] Initial commit\" --allow-empty"
155 serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git