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 longline = %C(auto)%h %<(52,trunc)%s (%aN, %GS %G?, %cr) %d
46 longlines = %C(auto)%h %<(52,trunc)%s (%aN, %GS %G?, %cr) %d %n%-w(0,8,8)%+b%-
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
81 cpa = cherry-pick --abort
82 cpc = cherry-pick --continue
87 cam = commit --all --message
88 fix = commit --all --fixup
90 diff = diff --word-diff
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"
105 ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
106 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'
107 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'
108 lc = "!f() { git ll "$1"^.."$1"; }; f"
109 lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
114 lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
115 lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all
117 taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'"
123 please = push --force-with-lease
131 rbc = rebase --continue
132 rbi = rebase --interactive
138 rh1 = reset --hard HEAD^
139 rh2 = reset --hard HEAD^^
152 sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f"
153 # update/pull subtree
154 sbu = "!f() { git subtree pull --prefix $2 $1 master --squash; }; f"
156 # initial empty commit
157 empty = "!git commit -am\"[empty] Initial commit\" --allow-empty"
161 serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git