summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2016-12-19 09:47:20 +0100
committerPeter Palfrader <peter@palfrader.org>2016-12-19 09:47:20 +0100
commitd97c13721dfa52e8df8052c3947d2b060e0e7661 (patch)
tree722e6bea10b4ccd62663b0310ed8e9bd5f0e4971
parent964e27ea42cf871308fd0a51875234a9ea1e3f92 (diff)
merge options
-rw-r--r--gitconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 6d8edf5..96ee73a 100644
--- a/gitconfig
+++ b/gitconfig
@@ -15,7 +15,11 @@
branch = auto
[http]
sslCAPath = /etc/ssl/certs
+[pull]
+ mergeoptions = --ff-only
+ ff = only
[merge]
+ ff = false
summary = true
log = 5000
[branch "debian-merge"]