From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>, Paul Tan <pyokagan@gmail.com>,
David Aguilar <davvid@gmail.com>
Subject: [PATCH 3/4] Documentation/config.txt: clarify that pull.ff overrides merge.ff
Date: Wed, 13 May 2015 17:52:19 +0800 [thread overview]
Message-ID: <1431510740-9710-4-git-send-email-pyokagan@gmail.com> (raw)
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 <pyokagan@gmail.com>
---
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
next prev parent reply other threads:[~2015-05-13 9:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-13 9:52 [PATCH 0/4] make pull.ff=true override merge.ff Paul Tan
2015-05-13 9:52 ` [PATCH 1/4] t7601: test for pull.ff=true overrides merge.ff=false Paul Tan
2015-05-14 13:06 ` Johannes Schindelin
2015-05-14 16:45 ` Junio C Hamano
2015-05-14 16:53 ` sh -x -i -v with continuous integration, was " Johannes Schindelin
2015-05-14 17:06 ` Junio C Hamano
2015-05-16 15:28 ` Jeff King
2015-05-16 19:07 ` Junio C Hamano
2015-05-18 18:45 ` Jeff King
2015-05-18 20:41 ` Junio C Hamano
2015-05-18 20:50 ` Jeff King
2015-05-18 20:58 ` Junio C Hamano
2015-05-16 12:33 ` Paul Tan
2015-05-13 9:52 ` [PATCH 2/4] pull: make pull.ff=true override merge.ff Paul Tan
2015-05-13 9:52 ` Paul Tan [this message]
2015-05-13 9:52 ` [PATCH 4/4] pull: parse pull.ff as a bool or string Paul Tan
2015-05-14 12:59 ` [PATCH 0/4] make pull.ff=true override merge.ff Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431510740-9710-4-git-send-email-pyokagan@gmail.com \
--to=pyokagan@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).