Re: git-pull and tag objects

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Feb 14, 2007, 16:35 UTC
Message-ID: <Pine.LNX.4.64.0702140831160.3604@woody.linux-foundation.org>
In-Reply-To: <Pine.LNX.4.63.0702141213150.22628@wbgn013.biozentrum.uni-wuerzburg.de>

On Wed, 14 Feb 2007, Johannes Schindelin wrote:

> 
> The chance of a mismerge is somewhat real, though. At first I thought that 
> you'd need a special script anyway, until I realized that it's just a 
> matter of "git merge -s theirs <from-devel>".

In fact, it's even quite doable as

	git commit-tree theirs^{tree} -p HEAD -p theirs < changelog

(choose your parent order at will) so it's not as if it's much of a "script". It's a core command to do something like this.

Using "git commit -s theirs" might not work (shouldn't, but I didn't test) for the first entry, so you probably *do* want to script this regardless. But git makes it really really easy.

		Linus