John Nowak <john@xxxxxxxxxxxxx> writes: > I am able to reproduce a scenario where, after a 'commit' and a 'stash > pop' that results in a merge conflict, I need to 'reset' a file twice in > order to get the index back to HEAD. Thanks, you found a bug in "git reset [<commit>] -- path" codepath, it seems, when dealing with an unmerged path. -- 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