From: Ryan Anderson <ryan@michonline•com>
To: Thomas Glanzmann <sithglan@stud•uni-erlangen.de>
Cc: Andreas Ericsson <ae@op5•se>, GIT <git@vger•kernel.org>
Subject: Re: Prepend the history of one git tree to another
Date: Mon, 20 Feb 2006 05:57:55 -0500 [thread overview]
Message-ID: <43F9A0B3.6020304@michonline.com> (raw)
In-Reply-To: <20060220104345.GG26454@cip.informatik.uni-erlangen.de>
[-- Attachment #1: Type: text/plain, Size: 945 bytes --]
Thomas Glanzmann wrote:
>Hello Andreas,
>
>
>
>>Something like this might do the trick, depending on how linear your
>>ancestry graph is:
>>
>>
>
>
>
>>$ cd blastwave
>>$ first=$(git rev-list HEAD | tail -n 1)
>>$ git format-patch -k --stdout $first..HEAD > ../blw.mbox
>>$ cd ../blastwave.old
>>$ git am -k -3 ../blw.mbox
>>
>>
>
>My graph is very linear. However. I have binaries checked into my tree.
>I am not sure if format-patch can handle this.
>
>
I wrote a program called "graft-ripple", that takes a commit, and
rewrites the current branch's history to reflect as if it started at
that commit.
It doesn't ever actually work with diffs or anything, it just reads
commits and trees and recreates them.
It's in the list archives, but I appear to have deleted it when I was
cleaning up my archives.
http://www.gelato.unsw.edu.au/archives/git/0511/12965.html
Hope this helps!
--
Ryan Anderson
sometimes Pug Majere
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 256 bytes --]
next prev parent reply other threads:[~2006-02-20 10:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-20 9:09 Prepend the history of one git tree to another Thomas Glanzmann
2006-02-20 10:14 ` Andreas Ericsson
2006-02-20 10:43 ` Thomas Glanzmann
2006-02-20 10:57 ` Ryan Anderson [this message]
2006-02-20 12:20 ` Thomas Glanzmann
2006-02-20 12:51 ` Johannes Schindelin
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=43F9A0B3.6020304@michonline.com \
--to=ryan@michonline$(echo .)com \
--cc=ae@op5$(echo .)se \
--cc=git@vger$(echo .)kernel.org \
--cc=sithglan@stud$(echo .)uni-erlangen.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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