Re: Possible bug: git pull --rebase discards local commits

2017-03-09 Thread Igor Djordjevic
Hi Junio, On 23/08/2016 21:28, Junio C Hamano wrote: > Joshua Phillips writes: > > I've found a case where git pull --rebase discards commits in my branch > > if the remote-tracking branch was rewound (and the remote tracking > > branch's reflog contains my branch's latest commit). This is due to

Re: Possible bug: git pull --rebase discards local commits

2016-08-23 Thread Junio C Hamano
Joshua Phillips writes: > I've found a case where git pull --rebase discards commits in my branch > if the remote-tracking branch was rewound (and the remote tracking > branch's reflog contains my branch's latest commit). This is due to > git-pull's usage of git merge-base --fork-point. > > On on