Disable "ff-only" for merges because it blocks subtree merges

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

diff --git a/.config/git/config b/.config/git/config
index 687981b693ab1f5501854eec7267342890c843d7..0cc42369ba4f2149eaed61ac7a878bbfd8a7b53c 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
@@ -37,8 +40,6 @@
   # show short ref names but only in terminal
   decorate = auto
 [merge]
-  # only do fastforward merges
-  ff = only
   # use vimdiff as mergetool
   tool = vimdiff
 [pretty]
@@ -57,7 +58,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