Re: [PATCH v3 05/11] Documentation/replace: add Creating Replacement Objects section

From: Christian Couder <chriscool@tuxfamily.org>
Date: Sep 1, 2013, 10:27 UTC
Message-ID: <20130901.122716.141236934846069455.chriscool@tuxfamily.org>
In-Reply-To: <23F4E42FEAEB41DCA9B6F18EED5DD4D0@PhilipOakley>

From: "Philip Oakley" <philipoakley@iee.org>

Show 11 quoted lines

>
> From: "Christian Couder" <chriscool@tuxfamily.org>
>
>> +CREATING REPLACEMENT OBJECTS
>> +----------------------------
>> +
>> +linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and
>> +linkgit:git-rebase[1],
> 
> Let's not forget the obvious 'git commit' or 'git merge' on a
> temporary branch for creating a replacement commit.

As it is obvious, and as it is somehow addressed in the below part of
this section, I don't think it is worth talking about git commit or
git merge or git cherry-pick or any other command.

> In particular we need to have covered the alternate to a graft of "A B
> C" (i.e. A is now a merge of B & C) if we are to deprecate grafts with
> any conviction. (https://git.wiki.kernel.org/index.php/GraftPoint)

Adding such an example in a new EXAMPLE section would address this better. If people agree I will do it in a following patch.

Show 11 quoted lines

>> among other git commands, can be used to create
>> +replacement objects from existing objects.
>> +
>> +If you want to replace many blobs, trees or commits that are part of
>> a
>> +string of commits, you may just want to create a replacement string
>> of
>> +commits and then only replace the commit at the tip of the target
>> +string of commits with the commit at the tip of the replacement
>> string
>> +of commits.

Thanks, Christian.