Re: Lost changes after merge

From: Gray King <grayking.w@gmail.com>
Date: Oct 30, 2018, 02:46 UTC
Message-ID: <CAP1N1j7AbiYLfe4EiFn-4zdBd-nD2paXx1hZhqiUCOq4iLh9zw@mail.gmail.com>
In-Reply-To: <20181029141804.GC17668@sigill.intra.peff.net>

Sorry, seems the link has been expired, here is the new one:

* Before merge run `git log --format="%h %p %d" -n 20 --all --graph`:

https://cfp.vim-cn.com/cbfq6

* After merged run `git log --format="%h %p %d" -n 20 --all --graph`:

https://cfp.vim-cn.com/cbfq7

在 2018年10月29日 下午10:18:07, Jeff King (peff@peff.net(mailto:peff@peff.net)) 写到:

Show 15 quoted lines

> On Mon, Oct 29, 2018 at 09:49:20AM +0100, Gray King wrote:
>
> > Hello,
> >
> > I have a very strange issue described below:
> >
> > * Here is the tree before I merge via `git log --format="%h %p %d" -n
> > 20 --all --graph`:
> >
> > https://upaste.de/9Pe
>
> FWIW, neither this nor the other paste link in your email seem to work
> for me (which makes it hard to comment on the rest of the email).
>
> -Peff