Re: [PATCH] transplant: move a series of commits to a different parent

From: Steffen Prohaska <prohaska@zib.de>
Date: Jun 24, 2007, 06:55 UTC
Message-ID: <F2287087-FE29-4858-A273-49BC5A1C2894@zib.de>
In-Reply-To: <Pine.LNX.4.64.0706232151480.4059@racer.site>

On Jun 23, 2007, at 10:54 PM, Johannes Schindelin wrote:

Show 12 quoted lines

>> git-transplant.sh <onto> <from> <to>
>>
>> transplant starts with the contents of <onto> and puts on top of
>> it the contents of files if they are touched by the series of
>> commits <from>..<to>.
>
> This reeks of rebase.
>
> IOW, I suspect that it does almost the same as
>
> 	git checkout <to>
> 	git rebase -s ours --onto <onto> <from>^

It doesn't do anything useful for me. In fact it seems as if it did nothing.

I tried your proposal:
  - rebase says 'Changes from <onto> to <onto>',
  - then it rewinds to <onto>,
  - next it says several time 'Already applied: ...' with increasing
    patch numbers,
  - then 'All done',
  - The result is the same as if I executed 'git reset --hard <onto>'.

I thought about something similar before I wrote transplant. Honestly, I didn't understand what rebase would do combined with ours.

	Steffen