summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-04-21 16:06:55 +0200
committerKali Kaneko (leap communications) <kali@leap.se>2017-04-21 16:06:55 +0200
commit24c9886e032fc108488702a2f9ef1bf9702a5356 (patch)
treee6e526196cee3f128bb81e69217bab861fe7615c
parent26fddd9123353ccce26931d76ed9003afd30f9a9 (diff)
[docs] fix phrasing about fast-forwards
-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 d2ebd68b..48f0a053 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