X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.config%2Fgit%2Fconfig;h=7409bdae9c7337e80e8b3eed436f460fe6b2eb7a;hb=67e8de90b190735c1982136f18f92e86564ae992;hp=399a3a7ec8c8b1df449daca887c220df003b9dae;hpb=e69dc04be35e858ceb3cb7cced41c052ac66ba99;p=user%2Fhenk%2Fvcsh%2Fgit.git

diff --git a/.config/git/config b/.config/git/config
index 399a3a7..7409bda 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,10 +1,17 @@
 [user]
   name = Hendrik Jäger
   email = gitcommit@henk.geekmail.org
+  signingKey = 0x1B7EADFDDF720123
 
 [branch]
   # always make new branches rebase on their tracking branch
   autosetuprebase = always
+[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
@@ -12,22 +19,38 @@
   renames = copies
   # use different color for moved code (default == zebra, currently)
   colorMoved = default
+  # use vimdiff as difftool
+  tool = vimdiff
+[difftool]
+  # do not prompt before invoking difftool
+  prompt = false
 [fetch]
   # delete tracking references and info about remote branches
   # does not delete any branches
   prune = true
 [format]
   # show a lot of info by default
-  pretty=fuller
+  pretty=compact
 [grep]
   # show linenumber (-n)
   lineNumber = true
+[log]
+  # show short commit sha
+  abbrevCommit = true
+  # show short ref names but only in terminal
+  decorate = auto
 [merge]
   # only do fastforward merges
   ff = only
+  # use vimdiff as mergetool
+  tool = vimdiff
+[pretty]
+  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
+  # also push reachable annotated tags
+  followTags = true
 [pull]
   # rebase, don’t merge, local changes
   rebase = true
@@ -37,7 +60,7 @@
   # when in a dirty worktree, automatically create a stash before and apply after rebasing
   autoStash = true
   # automatically squash marked commits (squash! …, fixup! …)
-  autosquash = true
+  autoSquash = true
 [rerere]
   # don’t use rerere to resolve merge conflicts
   enabled = false
@@ -61,16 +84,9 @@
   cpc = cherry-pick --continue
 
   c     = commit
+  ca    = commit --all
   cm    = commit --message
-  cma   = commit --all --message
-  cmv   = commit --verbose
-  cmav  = commit --all --verbose
-  amend = commit --amend
-  ca    = commit --amend
-  cam   = commit --amend --message
-  can   = commit --amend --no-edit
-  caa   = commit --amend --all
-  cana  = commit --amend --all --no-edit
+  cam   = commit --all --message
   fix   = commit --all --fixup
 
   diff  = diff --word-diff
@@ -88,16 +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]"
+  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'"
 
@@ -143,4 +152,4 @@
 
   wl = worktree list
 
-  serve = !git daemon --reuseaddr --verbose  --base-path=. --export-all ./.git
+  serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git