git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Philippe Vaucher <philippe.vaucher@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>,
	Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
	"W. Trevor King" <wking@tremily.us>,
	Philip Oakley <philipoakley@iee.org>,
	Marc Branchaud <marcnarc@xiplink.com>,
	Richard Hansen <rhansen@bbn.com>, Andreas Krey <a.krey@gmx.de>,
	Marat Radchenko <marat@slonopotamus.org>
Subject: Re: Summary of the problems with git pull
Date: Wed, 28 May 2014 09:13:32 +0200	[thread overview]
Message-ID: <CAGK7Mr4uucBN=17ph5pBjrz7yP60By1sERU9oBL+c2-gsMDmrw@mail.gmail.com> (raw)
In-Reply-To: <536de90320f06_239010732fc82@nysa.notmuch>

> Felipe Contreras wrote:
>> == git update ==
>>
>> Another proposed solution is to have a new command: `git update`. This
>> command would be similar to `git pull --ff-only` by default, but it
>> could be configured to do merges instead, and when doing so in reverse.
>
> And here it is:
>
> https://github.com/felipec/git/commits/fc/update
>
> Here's the documentation:
>
> https://github.com/felipec/git/wiki/git-update
>
> Works exactly as expected: non-fast-forwards are rejected by default,
> but can be configured, and parents are reversed when merging.

I know patches from Felipe are sensitive subject and that a lot of
people probably simply ignore him entirely, however I think this patch
deserves more attention.

>From what I read, it seems to really improve the "pull" issues and is
more or less in line with what Junio suggested what should be done in
[1]. So the goal of this mail is just to make sure people consider it
for inclusion.

Sorry if I missed a thread where it was already decided not to include it.

Felipe, please don't use this to start any non-constructive behavior
(rant on who is right/wrong, "my patches are not accepted", etc).

Philippe

[1] http://article.gmane.org/gmane.comp.version-control.git/248258

  reply	other threads:[~2014-05-28  7:14 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-05  0:29 Summary of the problems with git pull Felipe Contreras
2014-05-06 20:03 ` Damien Robert
2014-05-07 10:39 ` Ping Yin
2014-05-10  8:53 ` Felipe Contreras
2014-05-28  7:13   ` Philippe Vaucher [this message]
2014-05-28  8:39     ` Felipe Contreras
  -- strict thread matches above, loose matches on Subject: below --
2014-05-06 10:58 Felipe Contreras

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='CAGK7Mr4uucBN=17ph5pBjrz7yP60By1sERU9oBL+c2-gsMDmrw@mail.gmail.com' \
    --to=philippe.vaucher@gmail.com \
    --cc=a.krey@gmx.de \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=marat@slonopotamus.org \
    --cc=marcnarc@xiplink.com \
    --cc=philipoakley@iee.org \
    --cc=rhansen@bbn.com \
    --cc=wking@tremily.us \
    /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).