From: Felipe Contreras <felipe.contreras@gmail.com>
To: John Keeping <john@keeping.me.uk>
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
git@vger.kernel.org, Andreas Krey <a.krey@gmx.de>
Subject: Re: [PATCH 0/3] Reject non-ff pulls by default
Date: Mon, 9 Sep 2013 18:02:35 -0500 [thread overview]
Message-ID: <CAMP44s0y-cpEWuPTQSwC-Hyp-RNcwdyDRTbAsUewH5bAPPMXuQ@mail.gmail.com> (raw)
In-Reply-To: <20130909202435.GJ2582@serenity.lan>
On Mon, Sep 9, 2013 at 3:24 PM, John Keeping <john@keeping.me.uk> wrote:
> On Mon, Sep 09, 2013 at 03:52:31PM -0400, Jeff King wrote:
>> On Mon, Sep 09, 2013 at 11:47:45AM -0700, Junio C Hamano wrote:
>>
>> > You are in favor of an _option_ to allow people to forbid a pull in
>> > a non-ff situation, and I think other people are also in
>> > agreement. So perhaps:
>> >
>> > - drop jc/pull-training-wheel and revert its merge from 'next';
>> >
>> > - update Felipe's series with a bit of tweak to make it less
>> > impactful by demoting error into warning and advice.
>> >
>> > would be a good way forward?
>>
>> I think that would address the concern I raised, because it does not
>> create a roadblock to new users accomplishing their task. They can
>> ignore the warning, or choose "merge" as the default to shut up the
>> warning (and it is easy to choose that if you are confused, because it
>> is what git is doing by default alongside the warning).
>
> I think we need to make sure that we give instructions for how to go
> back if the default hasn't done what you wanted. Something like this:
>
> Your pull did not fast-forward, so Git has merged '$upstream' into
> your branch, which may not be correct for your project. If you
> would rather rebase your changes, run
>
> git rebase
>
> See "pull.mode" in git-config(1) to suppress this message in the
> future.
And you propose to show that every single time the user does a 'git
pull'' that results in a non-fast-forward merge? Isn't that what 'git
pull --help' is for?
--
Felipe Contreras
next prev parent reply other threads:[~2013-09-09 23:02 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-31 22:38 [PATCH 0/3] Reject non-ff pulls by default Felipe Contreras
2013-08-31 22:38 ` [PATCH 1/3] merge: simplify ff-only option Felipe Contreras
2013-08-31 22:38 ` [PATCH 2/3] t: replace pulls with merges Felipe Contreras
2013-08-31 22:38 ` [PATCH 3/3] pull: reject non-ff pulls by default Felipe Contreras
2013-09-03 17:21 ` [PATCH 0/3] Reject " Junio C Hamano
2013-09-03 21:50 ` Felipe Contreras
2013-09-03 22:38 ` Junio C Hamano
2013-09-03 22:59 ` Felipe Contreras
2013-09-04 8:10 ` John Keeping
2013-09-04 9:25 ` Jeff King
2013-09-04 10:16 ` John Keeping
2013-09-08 2:52 ` Felipe Contreras
2013-09-08 4:18 ` Jeff King
2013-09-08 4:37 ` Felipe Contreras
2013-09-08 4:43 ` Jeff King
2013-09-08 5:09 ` Felipe Contreras
2013-09-08 5:21 ` Jeff King
2013-09-08 6:17 ` Felipe Contreras
2013-09-08 6:54 ` Jeff King
2013-09-08 7:15 ` Felipe Contreras
2013-09-08 7:50 ` Jeff King
2013-09-08 8:43 ` Felipe Contreras
2013-09-09 20:17 ` Jeff King
2013-09-09 22:59 ` Felipe Contreras
2013-09-08 10:03 ` John Keeping
2013-09-09 20:04 ` Jeff King
2013-09-08 17:26 ` brian m. carlson
2013-09-08 22:38 ` Felipe Contreras
2013-09-09 0:01 ` brian m. carlson
2013-09-09 0:29 ` Felipe Contreras
2013-09-09 0:36 ` Felipe Contreras
2013-09-09 0:38 ` brian m. carlson
2013-09-09 7:18 ` Matthieu Moy
2013-09-09 18:47 ` Junio C Hamano
2013-09-09 19:52 ` Jeff King
2013-09-09 20:24 ` John Keeping
2013-09-09 20:44 ` Jeff King
2013-09-09 21:10 ` John Keeping
2013-09-09 21:48 ` Richard Hansen
2013-09-09 20:50 ` Matthieu Moy
2013-09-09 20:53 ` Jeff King
2013-09-09 21:34 ` Philip Oakley
2013-09-09 23:02 ` Felipe Contreras [this message]
2013-09-10 8:08 ` John Keeping
2013-09-09 20:47 ` Matthieu Moy
2013-09-10 21:56 ` Junio C Hamano
2013-09-09 23:17 ` Felipe Contreras
2013-09-10 8:26 ` Matthieu Moy
2013-09-11 10:53 ` Felipe Contreras
2013-09-11 11:38 ` Matthieu Moy
2013-09-13 0:55 ` Felipe Contreras
2013-09-04 16:59 ` Junio C Hamano
2013-09-04 17:17 ` Junio C Hamano
2013-09-04 22:08 ` Philip Oakley
2013-09-04 22:59 ` Junio C Hamano
2013-09-05 8:06 ` John Keeping
2013-09-05 19:18 ` Junio C Hamano
2013-09-05 19:26 ` John Keeping
2013-09-06 21:41 ` Jonathan Nieder
2013-09-06 22:14 ` Junio C Hamano
2013-09-07 11:07 ` John Keeping
2013-09-08 2:36 ` Felipe Contreras
2013-09-08 2:34 ` Felipe Contreras
2013-09-08 8:01 ` Philip Oakley
2013-09-08 8:16 ` Felipe Contreras
2013-09-08 8:42 ` Philip Oakley
2013-09-08 8:49 ` Felipe Contreras
2013-09-08 10:02 ` Philip Oakley
2013-09-08 10:39 ` Philip Oakley
2013-09-05 11:01 ` John Szakmeister
2013-09-05 11:38 ` John Keeping
2013-09-05 12:37 ` John Szakmeister
2013-09-05 15:20 ` Richard Hansen
2013-09-05 21:30 ` Philip Oakley
2013-09-05 23:45 ` Junio C Hamano
2013-09-05 23:38 ` Junio C Hamano
2013-09-08 2:41 ` Felipe Contreras
2013-09-08 6:17 ` Richard Hansen
2013-09-08 18:10 ` Junio C Hamano
2013-09-08 20:05 ` Richard Hansen
2013-09-08 22:46 ` Philip Oakley
2013-09-08 22:46 ` Felipe Contreras
2013-09-08 23:11 ` Ramkumar Ramachandra
2013-09-05 13:31 ` Greg Troxel
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=CAMP44s0y-cpEWuPTQSwC-Hyp-RNcwdyDRTbAsUewH5bAPPMXuQ@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/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).