summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2021-10-04 01:13:52 +0200
committerRichard Braun <rbraun@sceen.net>2021-10-04 01:15:00 +0200
commitded9e3ba15915c02ac04b6e855ef2fd702fbc448 (patch)
tree1f9ba868660986f56b1d537f3ef0b38f07e63ee9
parent17516adfffd55cddac61ea8061e641062df3bdc3 (diff)
git: fast-forward pulls only by default
-rw-r--r--git/gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/git/gitconfig b/git/gitconfig
index e293a8c..8d61647 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -22,6 +22,8 @@
[push]
default = simple
recurseSubmodules = check
+[pull]
+ ff = only
[submodule]
recurse = true
[log]