On Mon, Mar 2, 2009 at 2:04 AM, Jeff King <peff@xxxxxxxx> wrote: > On Mon, Mar 02, 2009 at 07:59:49AM +0100, Björn Steinbrink wrote: > >> Hm, how about this? >> git checkout --theirs file >> git mv file newname >> git checkout HEAD file # Can't use --ours here due to the mv > > Actually, you can use --ours if you don't "git mv": > > git checkout --theirs file > mv file newfile > git checkout --ours file > git add file newfile > > One more command, but I think more obvious about what is going on (and I > think both are better than the other suggestions). This is a superior answer as well because it avoids plumbing in a situation where plumbing ought not be needed. 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
