3 email = gitcommit@henk.geekmail.org
6 # always make new branches rebase on their tracking branch
7 autosetuprebase = always
9 # show diff in commit message editor
12 # use (i)ndex, (w)orktree, (c)ommit, etc instead of a/ and b/
14 # detect renames and copies
16 # use different color for moved code (default == zebra, currently)
18 # use vimdiff as difftool
21 # do not prompt before invoking difftool
24 # delete tracking references and info about remote branches
25 # does not delete any branches
28 # show a lot of info by default
31 # show linenumber (-n)
34 # show short commit sha
36 # show short ref names but only in terminal
39 # only do fastforward merges
41 # use vimdiff as mergetool
44 longline = %C(auto)%h %<(52,trunc)%s (%aN, %GS %G?, %cr) %d
45 longlines = %C(auto)%h %<(52,trunc)%s (%aN, %GS %G?, %cr) %d %n%-w(0,8,8)%+b%-
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 cma = commit --all --message
87 cmv = commit --verbose
88 cmav = commit --all --verbose
89 fix = commit --all --fixup
91 diff = diff --word-diff
94 dlc = diff --cached HEAD^
96 dr = "!f() { git diff -w "$1"^.."$1"; }; f"
97 diffr = "!f() { git diff "$1"^.."$1"; }; f"
100 f = "!git ls-files | grep -i"
106 ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
107 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'
108 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'
109 lc = "!f() { git ll "$1"^.."$1"; }; f"
110 lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
115 lg = log --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset" --abbrev-commit
116 lga = log --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset" --abbrev-commit --all
118 taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'"
124 please = push --force-with-lease
132 rbc = rebase --continue
133 rbi = rebase --interactive
139 rh1 = reset --hard HEAD^
140 rh2 = reset --hard HEAD^^
153 sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f"
154 # update/pull subtree
155 sbu = "!f() { git subtree pull --prefix $2 $1 master --squash; }; f"
157 # initial empty commit
158 empty = "!git commit -am\"[empty] Initial commit\" --allow-empty"
162 serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git