From: Yang Zhang <yanghatespam@gmail.com>
Date: Sat, 20 Nov 2010 20:12:27 GMT
Subject: Re: How to fix “Your branch and 'origin/master' have diverged” after editing a commit that came before a pull?
Message-ID: <AANLkTinFhFjxLNnu-CZiAnGpcFG8Hu-bL1N5ME89ZTku@mail.gmail.com>
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/