summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2021-04-28 10:37:29 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2021-04-28 10:37:29 +0200
commitd8da74ca810b2053679670a36de2246f3b42d823 (patch)
tree6f67ecbc341e7081139df226fb1c0e021b6a1d9c
parentff61029f6e7fbdd05bdacbf7524c3847d8105550 (diff)
Only fast-forward on pulls, don't merge
-rw-r--r--gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 58271a2..f0deaf4 100644
--- a/gitconfig
+++ b/gitconfig
@@ -19,3 +19,5 @@
helper = cache
[init]
defaultBranch = main
+[pull]
+ ff = only

Contact - Imprint