Hi, On Tue, 5 Dec 2006, Andreas Ericsson wrote: > Johannes Schindelin wrote: > > > > The only possible exception I can think of: git-reset --mixed when a merge > > failed. > > Indeed, but any invocation of git-reset means you'll quite likely have > to re-do the merge to get all changes anyways. But the working directory still contains the changes (and conflicts) with --mixed. A valid workflow would then be to compare to the index directly, instead of having to ask "git diff --ours" all the time. And if I'm not mistaken, a commit (after cleaning up the conflicts) would not record the merge as a merge. Ciao, Dscho - 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