On Mon, Mar 02, 2009 at 06:36:04AM +0000, Charles Bailey wrote: > You can use git checkout-index --temp --stage=3 and then move it from > the auto-generated temporary name into its new place. Hmm. I was hoping there was something that would use the name "--theirs" instead of the mysterious "stage level 3". But it's still nicer than the "git show" I gave because of: > Using a checkout variant instead of a show or a cat-file might be > important if you are doing autocrlf or some other smudging. Right. For some reason I was thinking that cat-file did not handle this but "git show" did, but I just tested and it clearly doesn't. So yes, you should definitely use checkout-index if you care about conversions. -Peff -- 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
