$ git status ChangeLog fatal: cannot do a partial commit during a merge. $ Huh? I'm not committing. I'm asking for status. Doing "git status" will tell me it's `unmerged'. -- 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