From: Jan Engelhardt <jengelh@medozas.de>
Date: Thu, 21 Oct 2010 15:19:41 GMT
Subject: Rebase vs Rebase-I differences
Message-ID: <alpine.LNX.2.01.1010211717050.10096@obet.zrqbmnf.qr>

Hi,


small bug observed in git 1.7.1: when one does `git rebase otherbranch` 
and there is a conflict, the conflict markers won't be showing the SHA 
id. In contrast to that, they do appear when using `git rebase -i 
otherbranch`.

<<<<<<<
this
=======
that
>>>>>>> 75a435a... commit message