Re: merge, keeping the remote as a new file?

From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Mar 2, 2009, 06:59 UTC
Message-ID: <20090302065949.GD6289@atjola.homenet>
In-Reply-To: <20090302064519.GA5635@coredump.intra.peff.net>

On 2009.03.02 01:45:19 -0500, Jeff King wrote:

Show 15 quoted lines

> 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.

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

Should work with the CRLF stuff, uses no plumbing, no stage numbers, there's no messing with random temp file names and it's still just three commands.

Björn