Fix typo

[user/henk/vcsh/git.git] / .config / git / config

diff --git a/.config/git/config b/.config/git/config
index 0150e5117ad14c8af34ee8ac9190b6b3d550f11e..7409bdae9c7337e80e8b3eed436f460fe6b2eb7a 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -9,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
@@ -57,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
@@ -101,18 +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
-  loga    = log --oneline --graph --all
+  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'"