Hi, On Sat, 30 Dec 2006, Raimund Bauer wrote: > * Johannes Schindelin wrote, On 30.12.2006 12:22: > > (Of course, the correct thing would not be "git reset --hard", but rather > > "git diff --ours | git apply -R; git reset", but that's a tad long, no?) > Then maybe introduce "git reset --ours" which does exactly that? That is possible. But does it make sense? It is a volatile state, and errors are too easy. So I think it makes sense to have to _ask_ for such a state. (Having said that, I think that it actually might make sense for bisecting an error where you _need_ a local patch to get it running to begin with.) Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Sat Dec 30 23:54:59 2006
This archive was generated by hypermail 2.1.8 : 2006-12-30 23:56:15 EST