summaryrefslogtreecommitdiff
path: root/docs/hacking
diff options
context:
space:
mode:
Diffstat (limited to 'docs/hacking')
-rw-r--r--docs/hacking/index.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/hacking/index.rst b/docs/hacking/index.rst
index d2ebd68..48f0a05 100644
--- a/docs/hacking/index.rst
+++ b/docs/hacking/index.rst
@@ -140,8 +140,9 @@ commits.
Merging code
---------------------------------
-Avoid fast-forwards, they make a very messy history. Put this in your
-gitconfig::
+We avoid merge commits into master, they make a very messy history. Put this
+in your gitconfig to only allow the merges that can be resolved as a
+fast-forward::
[merge]
ff = only