diff options
| author | Peter Palfrader <peter@palfrader.org> | 2016-12-19 09:47:20 +0100 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2016-12-19 09:47:20 +0100 |
| commit | d97c13721dfa52e8df8052c3947d2b060e0e7661 (patch) | |
| tree | 722e6bea10b4ccd62663b0310ed8e9bd5f0e4971 | |
| parent | 964e27ea42cf871308fd0a51875234a9ea1e3f92 (diff) | |
merge options
| -rw-r--r-- | gitconfig | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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"] |