Re: [git-users] Bringing back botched history in a rebaseable state

You might try 'imerge'. Git-imerge basically can construct a rebase, and it actually looks at all the commits along the way, rather than only the heads and merge-base. On 2017-08-28, at 3:28 AM, Marc Haber wrote: > On Mon, Aug 28, 2017 at 11:26:06AM +0300,

Re: [git-users] Bringing back botched history in a rebaseable state

On Mon, Aug 28, 2017 at 11:26:06AM +0300, Konstantin Khomoutov wrote: > On Sat, Aug 26, 2017 at 12:37:55PM +0200, Marc Haber wrote: > > But when I try to git rebase fan upon master, I get the same file that > > is even in the diff between msater and fan over and over again. I guess > > that git

Re: [git-users] Bringing back botched history in a rebaseable state

On Sat, Aug 26, 2017 at 12:37:55PM +0200, Marc Haber wrote: > Hi, > > whenever I think that I have finally understood how merging and rebasing > in git works, something happens and I am confused as before. > > The git history (obtained with git log --graph --oneline --decorate > --all) pasted