Bug#542709: I saw this bug too

2010-03-06 Thread Jonathan Nieder
retitle 542709 git-core: unexpectedly dirty index after rebase thanks Ximin Luo wrote: > if you only git-add, then when you try to git-rebase --continue, it will say: > > You must edit all merge conflicts and then > mark them as resolved using git add > > it will only proceed with the continue af

Bug#542709: I saw this bug too

2009-11-18 Thread Uli Schlachter
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi, I just saw something like this, too. After git rebase I got tons of conflicts, I fixed them up and "git add"'ed each file, but git rebase --continue just showed me the message the message above. (git status didn't report any unmerged files) Wi