summaryrefslogtreecommitdiffstatshomepage
path: root/git
diff options
context:
space:
mode:
Diffstat (limited to 'git')
-rw-r--r--git/.gitconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index cf81f16..9521860 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -23,7 +23,7 @@ defaultBranch = main
rebase = true
[merge]
-ff = no
+ff = only
[fetch]
prune = true