From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Paul Tan <pyokagan@gmail.com>
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>,
David Aguilar <davvid@gmail.com>
Subject: Re: [PATCH 0/4] make pull.ff=true override merge.ff
Date: Thu, 14 May 2015 14:59:35 +0200 [thread overview]
Message-ID: <f80d59c142b64c56fe7159452d4d10e3@www.dscho.org> (raw)
In-Reply-To: <1431510740-9710-1-git-send-email-pyokagan@gmail.com>
Hi Paul,
On 2015-05-13 11:52, Paul Tan wrote:
> Since b814da8 (pull: add pull.ff configuration, 2014-01-15), running
> git-pull with the configuration pull.ff=false or pull.ff=only is
> equivalent to passing --no-ff and --ff-only to git-merge. However, if
> pull.ff=true, no switch is passed to git-merge. This leads to the
> confusing behavior where pull.ff=false or pull.ff=only is able to
> override merge.ff, while pull.ff=true is unable to.
>
> This patch series adds a failing test to demonstrates the above, and fixes it.
>
> The documentation is also tweaked to clarify that pull.ff is meant to override
> merge.ff.
>
> The last patch makes pull.ff consistent with merge.ff by supporting the config
> aliases of true and false (on, off, 0, 1).
Looks very good!
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Ciao,
Dscho
prev parent reply other threads:[~2015-05-14 12:59 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 ` [PATCH 3/4] Documentation/config.txt: clarify that pull.ff overrides merge.ff Paul Tan
2015-05-13 9:52 ` [PATCH 4/4] pull: parse pull.ff as a bool or string Paul Tan
2015-05-14 12:59 ` Johannes Schindelin [this message]
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=f80d59c142b64c56fe7159452d4d10e3@www.dscho.org \
--to=johannes.schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=pyokagan@gmail.com \
--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).