From: Phil Susi <phillsusi@gmail.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: What happened to having to recover from upstream rebase?
Date: Mon, 11 May 2015 15:50:15 -0400 [thread overview]
Message-ID: <555107F7.1040906@gmail.com> (raw)
So it used to be that when upstream rebased, you'd get an error when you
tried to pull again and have to fix things up with some git reset or
rebase hackery. Trying to demo this today I found that the pull
*worked*, using an automatic recursive merge.
Am I crazy in thinking this used to error, and if not, when did it change?
next reply other threads:[~2015-05-11 19:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 19:50 Phil Susi [this message]
2015-05-13 9:37 ` What happened to having to recover from upstream rebase? Johannes Schindelin
2015-05-13 9:44 ` Matthieu Moy
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=555107F7.1040906@gmail.com \
--to=phillsusi@gmail.com \
--cc=git@vger.kernel.org \
/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).