From: Sergey Organov <sorganov@gmail•com>
To: Holger Hellmuth <hellmuth@ira•uka.de>
Cc: Jonathan Nieder <jrnieder@gmail•com>, git@vger•kernel.org
Subject: Re: rebase flattens history when it shouldn't?
Date: Wed, 06 Aug 2014 19:34:55 +0400 [thread overview]
Message-ID: <8738d91vj4.fsf@osv.gnss.ru> (raw)
In-Reply-To: <53E2452D.6000109@ira.uka.de> (Holger Hellmuth's message of "Wed, 06 Aug 2014 17:09:33 +0200")
Holger Hellmuth <hellmuth@ira•uka.de> writes:
> On 23.07.2014 21:33, Sergei Organov wrote:
>> What actually bothers me is the unfortunate consequence that "git pull"
>> is not always a no-op when nothing was changed at the origin since the
>> last "git pull". THIS is really surprising and probably should better be
>> fixed. Requiring -f is just one (obvious) way to fix this.
>
> That would invalidate the simple rule that "git pull" is equivalent to
> "git fetch" + "git rebase".
Sorry, I don't see how it would invalidate this. My suggestion even
won't change git-pull source code at all, only git-rebase code.
> git rebase depends on both branches it operates on, not just one. The
> same goes for "git merge", I assume it is just a coincidence that git
> merge does have this characteristic you now expect both to have.
git pull --reabse=false
git pull --rebase=preserve
both have this property.
git pull --rebase=true
almost always has this property, unless there are local merge commits to
be rebased.
So, I'd rather say it's likely behavior of "git pull --rebase=true" that
is a coincidence.
--
Sergey.
next prev parent reply other threads:[~2014-08-06 15:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-23 13:34 rebase flattens history when it shouldn't? Sergei Organov
2014-07-23 17:52 ` Jonathan Nieder
2014-07-23 19:33 ` Sergei Organov
2014-08-06 15:09 ` Holger Hellmuth
2014-08-06 15:34 ` Sergey Organov [this message]
2014-08-06 11:36 ` Sergey Organov
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=8738d91vj4.fsf@osv.gnss.ru \
--to=sorganov@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=hellmuth@ira$(echo .)uka.de \
--cc=jrnieder@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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