From: Paul Tan Date: Wed, 13 May 2015 09:52:19 GMT Subject: [PATCH 3/4] Documentation/config.txt: clarify that pull.ff overrides merge.ff Message-ID: <1431510740-9710-4-git-send-email-pyokagan@gmail.com> In-Reply-To: <1431510740-9710-1-git-send-email-pyokagan@gmail.com> Since the pull.ff setting was implemented in b814da8 (pull: add pull.ff configuration, 2014-01-15) pull.ff has always overridden merge.ff, although not mentioned in the documentation. As such, clarify that this is so. Signed-off-by: Paul Tan --- Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 948b8b0..ec0f9ef 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2042,7 +2042,7 @@ pull.ff:: a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the - command line). + command line). This setting overrides `merge.ff` when pulling. pull.rebase:: When true, rebase branches on top of the fetched branch, instead -- 2.1.4