Hi, On Tue, 27 Jul 2010, David D. Kilzer wrote: > When performing a non-interactive rebase, sometimes > "git rebase --continue" will fail if an unmodified file is > touched in the working directory: > > You must edit all merge conflicts and then > mark them as resolved using git add > > This is caused by "git diff-files" reporting a difference > between the index and the filesystem: > > :100644 100644 d00491...... 000000...... M file > > The fix is to run "git update-index --refresh" before > "git diff-files" as is done in git-rebase--interactive. > > Signed-off-by: David D. Kilzer <ddkilzer@xxxxxxxxxx> ACK! ... and thanks! Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html