From 24c9886e032fc108488702a2f9ef1bf9702a5356 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Fri, 21 Apr 2017 16:06:55 +0200 Subject: [docs] fix phrasing about fast-forwards --- docs/hacking/index.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/hacking') 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 -- cgit v1.2.3