git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alex Riesen <raa.lkml@gmail.com>
To: Steffen Prohaska <prohaska@zib.de>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] transplant: move a series of commits to a different parent
Date: Sun, 24 Jun 2007 10:20:27 +0200	[thread overview]
Message-ID: <20070624082027.GA2467@steel.home> (raw)
In-Reply-To: <9C4338DC-0C4A-4981-9EC9-2417513F629D@zib.de>

Steffen Prohaska, Sun, Jun 24, 2007 09:08:16 +0200:
> 
> On Jun 23, 2007, at 11:04 PM, Alex Riesen wrote:
> 
> >>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>.  If a commit touches a file the content of
> >>this file is taken as it is in the commit. No merging is
> >>performed. Original authors, commiters, and commit messages are
> >>preserved.
> >>
> >[...]
> ># 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.
> 

Ach, yes. I should have read your message a bit more closely. There is
a term for that "contents of files", BTW: "repository state".

> I believe it's more like git-filter-branch, but I wasn't yet abel to
> tell git-filter-branch how to do the job.

I suspect git-filter-branch can be both.

  reply	other threads:[~2007-06-24  8:20 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-23 12:51 [PATCH] cvsimport: test case for severe branch import problem Steffen Prohaska
2007-06-23 13:26 ` Steffen Prohaska
2007-06-23 19:27   ` [PATCH] transplant: move a series of commits to a different parent Steffen Prohaska
2007-06-23 20:54     ` Johannes Schindelin
2007-06-24  6:55       ` Steffen Prohaska
2007-06-23 21:04     ` Alex Riesen
2007-06-24  7:08       ` Steffen Prohaska
2007-06-24  8:20         ` Alex Riesen [this message]
2007-06-24 10:26         ` Johannes Schindelin
2007-06-24 10:45           ` Steffen Prohaska
2007-06-25  7:16         ` Johannes Sixt
2007-06-25  7:49           ` Steffen Prohaska
2007-06-25  8:03             ` Johannes Sixt
2007-06-24  8:29     ` Alex Riesen
2007-06-24  9:05       ` Steffen Prohaska
2007-06-24  9:30         ` Alex Riesen
2007-06-24 17:13           ` Steffen Prohaska
2007-06-24 18:35             ` Alex Riesen
2007-06-24 20:54               ` Steffen Prohaska
2007-06-24 22:20                 ` Alex Riesen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070624082027.GA2467@steel.home \
    --to=raa.lkml@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=prohaska@zib.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).