Re: [PATCH v1 1/3] replace: add --graft option

From: Junio C Hamano <gitster@pobox.com>
Date: May 23, 2014, 19:27 UTC
Message-ID: <xmqqsio0i9c5.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20140522213307.27162.14455.chriscool@tuxfamily.org>

Christian Couder <chriscool@tuxfamily.org> writes:

Show 9 quoted lines

> The usage string for this option is:
>
> git replace [-f] --graft <commit> [<parent>...]
>
> First we create a new commit that is the same as <commit>
> except that its parents are [<parents>...]
>
> Then we create a replace ref that replace <commit> with
> the commit we just created.

Shucks. An older version of this is already in 'next'. I'll postpone queuing the rerolled one until post-release when we will rewind 'next'.

Show 6 quoted lines

>
> With this new option, it should be straightforward to
> convert grafts to replace refs, with something like:
>
> cat .git/info/grafts | while read line
> do git replace --graft $line; done

Don't cat a single file into a pipeline.