Hi, On Mon, 4 Dec 2006, Jakub Narebski wrote: > Johannes Schindelin wrote: > > > On Sun, 3 Dec 2006, Luben Tuikov wrote: > > > >> This patch merely allows the user to say > >> git-checkout-index --stage=ours their_broken_file.c > >> instead of > >> git-checkout-index --stage=2 their_broken_file.c > >> and similarly for "theirs", etc. > > > > Dunno. When this problem hits me, I usually do > > > > git diff --theirs their_broken_file.c > > > > anyway, to see what it is doing (colour and all). When I am satisfied, > > that "theirs" is really what I want, I just go back one in history, and > > append a call to git-apply like this: > > > > git diff --theirs their_broken_file.c | git apply --index > > Then > > git checkout --theirs their_broken_file.c > > is obvious simplification. Obvious maybe. But simplification, not to me. Especially since the way I call it, there is less possibility to shoot myself into the foot. But then, I do not really care. 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