From: Holger Hellmuth <hellmuth@ira.uka.de>
To: Sergei Organov <osv@javad.com>, Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: rebase flattens history when it shouldn't?
Date: Wed, 06 Aug 2014 17:09:33 +0200 [thread overview]
Message-ID: <53E2452D.6000109@ira.uka.de> (raw)
In-Reply-To: <8738drj2fc.fsf@osv.gnss.ru>
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".
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.
next prev parent reply other threads:[~2014-08-06 15:24 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 [this message]
2014-08-06 15:34 ` Sergey Organov
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=53E2452D.6000109@ira.uka.de \
--to=hellmuth@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=osv@javad.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.