On Mon, Sep 17, 2007 at 01:24:57AM +0100, Johannes Schindelin wrote: > > "git diff" does not record index lines for pure mode changes (i.e. no > lines changed). Therefore, apply --index-info would call out a bogus > error. > > Instead, fall back to reading the info from the current index. > > Incidentally, this fixes an error where git-rebase would not rebase a > commit including a pure mode change, and changes requiring a threeway > merge. > > Noticed by Chris Shoemaker. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> Works for me. Thanks. Acked-by: Chris Shoemaker <chris.shoemaker@xxxxxxx> - 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