Re: Prepend the history of one git tree to another

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 20, 2006, 12:51 UTC
Message-ID: <Pine.LNX.4.63.0602201350210.23862@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <20060220104345.GG26454@cip.informatik.uni-erlangen.de>

Hi,

On Mon, 20 Feb 2006, Thomas Glanzmann wrote:

Show 13 quoted lines

> 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.

Do you need the history at all times? If not, you could just make a graft file. If you need it always, you could even check in a version of the graft file (but remember to copy it to .git/info/grafts, too).

Hth, Dscho