Jakub Narebski <jnareb@xxxxxxxxx> writes: > --unresolve:: > Restores the 'unmerged' or 'needs updating' state of a > file during a merge if it was cleared by accident. > > Unless "git add foo" not only adds current contents of foo at stage 0, > but also removes higher stages from index... By definition, adding anything at stage #0 is to remove higher stages. -- 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