summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Jäger <gitcommit@henk.geekmail.org>2020-12-07 13:51:06 +0100
committerHendrik Jäger <gitcommit@henk.geekmail.org>2020-12-07 13:51:06 +0100
commit5ff1dc226bd33494d1d6695a04ace9031eb99e97 (patch)
tree15bdda0e8da24d326d8682b80be59e08797313d7
parent67e8de90b190735c1982136f18f92e86564ae992 (diff)
Disable "ff-only" for merges because it blocks subtree merges
-rw-r--r--.config/git/config2
1 files changed, 0 insertions, 2 deletions
diff --git a/.config/git/config b/.config/git/config
index 7409bda..0cc4236 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -40,8 +40,6 @@
# show short ref names but only in terminal
decorate = auto
[merge]
- # only do fastforward merges
- ff = only
# use vimdiff as mergetool
tool = vimdiff
[pretty]