Pierre-François CLEMENT <lik...@gmail.com> writes: > Hm, I didn't think of "git apply --index"... Makes sense for this > special use, but I'm not sure about the other use cases.
Try merging another branch that tracks a file your current branch does not know about and ending up with conflicts during that merge. Resetting the half-done result away must remove that new path from your working tree and the index. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
