Re: Lost changes after merge

2018-10-31 Thread Brandon McCaig
Gray: On Tue, Oct 30, 2018 at 03:46:28AM +0100, Gray King wrote: > * 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 I also cannot

Re: Lost changes after merge

2018-10-30 Thread Rafael Ascensão
The commits you mentioned are not present on the new pastes. On Tue, Oct 30, 2018 at 03:46:28AM +0100, Gray King wrote: > 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`: > One thing I noticed, is that you're

Re: Lost changes after merge

2018-10-29 Thread Gray King
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

Re: Lost changes after merge

2018-10-29 Thread Jeff King
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

Re: Lost changes after merge

2018-10-29 Thread Gray King
After merged, the latest commit(a008c4d580) has lost and the second commit(a274b6e7ca) has been the latest, and changes missed too. 在 2018年10月29日 下午4:49:20, Gray King (graykin...@gmail.com(mailto:graykin...@gmail.com)) 写到: > > > Hello, > > I have a very strange issue described below: > > *

Lost changes after merge

2018-10-29 Thread Gray King
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 * Here is the output of `git log --format="%h %p %d" -2 path/to/file`: a008c4d580 c61f96eb5d a274b6e7ca 67c1000ca3 * Here is