From: Yang Zhang <yanghatespam@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: How to fix “Your branch and 'origin/master' have diverged” after editing a commit that came before a pull?
Date: Sat, 20 Nov 2010 12:12:27 -0800 [thread overview]
Message-ID: <AANLkTinFhFjxLNnu-CZiAnGpcFG8Hu-bL1N5ME89ZTku@mail.gmail.com> (raw)
In-Reply-To: <20101120043628.GB20725@sigill.intra.peff.net>
On Fri, Nov 19, 2010 at 8:36 PM, Jeff King <peff@peff.net> wrote:
> Whew, that turned out long. Hopefully it helps, and did not just confuse
> you more. :)
That was a *fantastic* explanation. Thank you!
--
Yang Zhang
http://yz.mit.edu/
next prev parent reply other threads:[~2010-11-20 20:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-20 0:36 How to fix “Your branch and 'origin/master' have diverged” after editing a commit that came before a pull? Yang Zhang
2010-11-20 1:59 ` Yang Zhang
2010-11-20 4:36 ` Jeff King
2010-11-20 20:12 ` Yang Zhang [this message]
2010-11-21 14:45 ` Gavin Guo
2010-11-21 16:30 ` Jeff King
2010-11-21 18:51 ` Yang Zhang
2010-11-22 5:38 ` Jeff King
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=AANLkTinFhFjxLNnu-CZiAnGpcFG8Hu-bL1N5ME89ZTku@mail.gmail.com \
--to=yanghatespam@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.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).