[commit]
# show diff in commit message editor
verbose = true
+[core]
+ # complain about tabs used for indenting
+ whitespace = tab-in-indent
[diff]
# use (i)ndex, (w)orktree, (c)ommit, etc instead of a/ and b/
mnemonicprefix = true
prune = true
[format]
# show a lot of info by default
- pretty=fuller
+ pretty=compact
[grep]
# show linenumber (-n)
lineNumber = true
# use vimdiff as mergetool
tool = vimdiff
[pretty]
- longline = '%C(auto)%h %<(52,trunc)%s (%aN, %GS %G?, %cr) %d'
- longlines = '%C(auto)%h %<(52,trunc)%s (%aN, %GS %G?, %cr) %d %n%-w(0,8,8)%+b%-'
+ compact = %C(auto)%h%Cgreen% cs%Cblue%<(15,trunc)% an%C(auto)%d%Creset% s
[push]
# push to branch with same name on remote
default = current
gr = grep -Ii
grep = grep -Ii
- ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
- 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'
- 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'
- lc = "!f() { git ll "$1"^.."$1"; }; f"
- lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
- lo = log --oneline
+ l = log
+ la = log --graph --all
lp = log --patch
- fl = log -u
- filelog = log -u
- lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
- lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all
# tag logs
taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'"