Re: [BUG] git-rebase: reword squashes commits in case of merge-conflicts

On 12.06.2018 12:08, Jeff King wrote:

 > Thanks for a thorough report. I couldn't reproduce it on v2.17.1 on
 > Linux, which makes me wonder if the issue is related to git-for-windows
 > somehow. To the best of my knowledge (and a quick scan of "git diff"
 > results) the code should be the same, though.

I gave native Git version 2.17.1 on Ubuntu 18.04 (no WSL this time) a try and was able to reproduce the issue outlined in my first email.

In case there is a misunderstanding, when I wrote

On 11.06.2018 18:06, ch wrote:

 > After the rebase the 'stuff' branch only has a single commit even though I'd
 > expect there to be two according to the instructions that were passed to
 > git-rebase.

I actually meant that there's only a single commit exclusively reachable from 'stuff' after the rebase, i.e.

   $ git log stuff ^master

only lists a single commit while there actually should be two unless I'm missing something.

Sorry for being a bit sloppy in my initial report.

- ch