On Thu, Feb 19, 2009 at 8:34 AM, John Tapsell <johnflux@xxxxxxxxx> wrote: > There's no reliable way of getting back to the state before the merge? Sure there is. Commit or stash before you merge, so that your index and working copy are clean. j. -- 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
