Prepare repository for merge

git/snippets/disable-fast-forward.md

@@ -0,0 +1,25 @@
+---
+title: Disable fast forward merging by default
+type: snippet
+tags: [configuration,repository]
+author: chalarangelo
+cover: people-on-beach
+dateModified: 2021-07-03T05:00:00-04:00
+---
+
+Disables the default fast forwarding on merge commits.
+
+- Use `git config --add merge.ff false` to disable fast-forward merging for all branches, even if it is possible.
+- You can use the `--global` flag to configure this option globally.
+
+```shell
+git config [--global] --add merge.ff false
+```
+
+```shell
+git config --global --add merge.ff false
+
+git checkout master
+git merge my-branch
+# Will never fast forward even if it's possible
+```