From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 24 Jan 2007 10:14:25 GMT
Subject: Re: How to pull only a few files from one branch to another?
Message-ID: <Pine.LNX.4.63.0701241110240.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <Pine.LNX.4.64.0701232012450.3606@woody.linux-foundation.org>

Hi,

On Tue, 23 Jan 2007, Linus Torvalds wrote:

> It would be kind of cool to have the whole "merge-recursive" logic 
> (which can handle multiple ancestors etc - unlike the above) able to do 
> this, but that's a whole 'nother kettle of fish.

You'd lose all the renaming logic when doing it strictly on a file level. 
So I suggest opening a sidebranch, doing the merge, and just pick the new 
file as you proposed with "git checkout -f sidebranch file".

Ciao,
Dscho