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 # use (i)ndex, (w)orktree, (c)ommit, etc instead of a/ and b/
15 # detect renames and copies
17 # use different color for moved code (default == zebra, currently)
19 # use vimdiff as difftool
22 # do not prompt before invoking difftool
25 # delete tracking references and info about remote branches
26 # does not delete any branches
29 # show a lot of info by default
32 # show linenumber (-n)
35 # show short commit sha
37 # show short ref names but only in terminal
40 # only do fastforward merges
42 # use vimdiff as mergetool
45 compact = %C(auto)%h%Cgreen% cs%Cblue%<(15,trunc)% an%C(auto)%d%Creset% s
47 # push to branch with same name on remote
49 # also push reachable annotated tags
52 # rebase, don’t merge, local changes
54 # only accept fastforwards by default
57 # when in a dirty worktree, automatically create a stash before and apply after rebasing
59 # automatically squash marked commits (squash! …, fixup! …)
62 # don’t use rerere to resolve merge conflicts
68 ai = add --interactive
80 cpa = cherry-pick --abort
81 cpc = cherry-pick --continue
86 cam = commit --all --message
87 fix = commit --all --fixup
89 diff = diff --word-diff
92 dlc = diff --cached HEAD^
94 dr = "!f() { git diff -w "$1"^.."$1"; }; f"
95 diffr = "!f() { git diff "$1"^.."$1"; }; f"
98 f = "!git ls-files | grep -i"
105 la = log --graph --all
108 taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'"
114 please = push --force-with-lease
122 rbc = rebase --continue
123 rbi = rebase --interactive
129 rh1 = reset --hard HEAD^
130 rh2 = reset --hard HEAD^^
143 sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f"
144 # update/pull subtree
145 sbu = "!f() { git subtree pull --prefix $2 $1 master --squash; }; f"
147 # initial empty commit
148 empty = "!git commit -am\"[empty] Initial commit\" --allow-empty"
152 serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git