All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Sixt <J.Sixt@eudaptics.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: Mon, 25 Jun 2007 10:03:02 +0200	[thread overview]
Message-ID: <467F76B6.2D814459@eudaptics.com> (raw)
In-Reply-To: 21FC6948-6969-47A4-9D6E-EFD9D98FC361@zib.de

Steffen Prohaska wrote:
> 
> On Jun 25, 2007, at 9:16 AM, Johannes Sixt wrote:
> >  $ echo "$(git-rev-parse from^0) $(git-rev-parse onto^0)" \
> >     > .git/info/grafts
> >  $ git-filter-branch new-to onto..to
> 
> ... ok this is interesting: git-filter-branch will take the info from
> grafts to create its new commits. The new commits will contain all
> information independent of the grafts file, right?

Yes.

> ... but, I'm not convinced that this is what I need. I need to mix the
> tree of onto with the files _modified_ between from..to. Taking _all_
> files from the commits between from..to is _wrong_. And I think that
> is what the command you proposed would do.

My proposed commands won't do what you need. They just change
parenthood, but not the tree snapshots that they represent.

-- Hannes

  reply	other threads:[~2007-06-25  8:02 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
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 [this message]
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=467F76B6.2D814459@eudaptics.com \
    --to=j.sixt@eudaptics.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.