git: Reject non-ff merges

2020-04-29 11:30:20 +01:00 · 2020-04-29 11:30:20 +01:00 · 7838681ef7
parent d134275ecf
commit 7838681ef7
1 changed files with 3 additions and 4 deletions
--- a/tag-git/gitconfig
+++ b/tag-git/gitconfig
@ -99,6 +99,9 @@
 [include]
 	path = ~/.gitconfig.local

+[merge]
+	ff = only
+
 [rebase]
 	autosquash = true
 	autostash = true
@ -117,10 +120,6 @@
 	ff = only
 	rebase = true

-[merge]
-	defaultToUpstream = true
-	ff = false
-
 [filter "lfs"]
 	process = git-lfs filter-process
 	required = true