X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.config%2Fgit%2Fconfig;h=82dd88687c05e8c2a833a988cb9d91c5d095044c;hb=a9040f4d71ab4a2b2e3b1eb5f69c88fa8dca1911;hp=53e10fbb048f0060b22f178a8d9d1d6ebe1fe65f;hpb=e53b639c3013fd200e76ae39296d8a4e566d1b19;p=user%2Fhenk%2Fvcsh%2Fgit.git

diff --git a/.config/git/config b/.config/git/config
index 53e10fb..82dd886 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,6 +1,7 @@
 [user]
   name = Hendrik Jäger
   email = gitcommit@henk.geekmail.org
+  signingKey = 0x1B7EADFDDF720123
 
 [branch]
   # always make new branches rebase on their tracking branch
@@ -8,6 +9,9 @@
 [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
@@ -26,7 +30,7 @@
   prune = true
 [format]
   # show a lot of info by default
-  pretty=fuller
+  pretty=compact
 [grep]
   # show linenumber (-n)
   lineNumber = true
@@ -41,8 +45,7 @@
   # 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
@@ -83,9 +86,7 @@
   c     = commit
   ca    = commit --all
   cm    = commit --message
-  cma   = commit --all --message
-  cmv   = commit --verbose
-  cmav  = commit --all --verbose
+  cam   = commit --all --message
   fix   = commit --all --fixup
 
   diff  = diff --word-diff
@@ -103,17 +104,9 @@
   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'"