From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 24 Jun 2007 10:26:11 GMT
Subject: Re: [PATCH] transplant: move a series of commits to a different parent
Message-ID: <Pine.LNX.4.64.0706241123170.4059@racer.site>
In-Reply-To: <9C4338DC-0C4A-4981-9EC9-2417513F629D@zib.de>

Hi,

On Sun, 24 Jun 2007, Steffen Prohaska wrote:

> On Jun 23, 2007, at 11:04 PM, Alex Riesen wrote:
> 
> > # detached head
> > git checkout $(git rev-parse onto) && git format-patch --stdout
> > --full-index from..to|git am -3
> 
> No. This one tries to apply the _changes_ between from..to. What I need 
> is the resulting _content_ of files modified between from..to.

Oh! But the commit messages do no longer correspond to their patches, do 
they?

Example:

In "onto", you have a sorely needed bugfix in main.c. In "from", you have 
not. Then you do your transplant, and all of a sudden, the 
first transplanted commit _undoes_ that bugfix (because you take the 
contents at face value), but the commit message _cannot_ say so, or even 
why.

IMHO this makes no sense (and that is why I misunderstood it as being a 
rebase).

Ciao,
Dscho