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

From: Philip Oakley <philipoakley@iee.org>
Date: Aug 31, 2013, 22:19 UTC
Message-ID: <23F4E42FEAEB41DCA9B6F18EED5DD4D0@PhilipOakley>
In-Reply-To: <20130831191215.26699.37641.chriscool@tuxfamily.org>

From: "Christian Couder" <chriscool@tuxfamily.org>

Show 22 quoted lines

> There were no hints in the documentation about how to create
> replacement objects.
>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
> Documentation/git-replace.txt | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/Documentation/git-replace.txt 
> b/Documentation/git-replace.txt
> index aa66d27..736b48c 100644
> --- a/Documentation/git-replace.txt
> +++ b/Documentation/git-replace.txt
> @@ -64,6 +64,19 @@ OPTIONS
>  Typing "git replace" without arguments, also lists all replace
>  refs.
>
> +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.

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)

Show 30 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.
> +
> BUGS
> ----
> Comparing blobs or trees that have been replaced with those that
> @@ -76,6 +89,9 @@ pending objects.
>
> SEE ALSO
> --------
> +linkgit:git-hash-object[1]
> +linkgit:git-filter-branch[1]
> +linkgit:git-rebase[1]
> linkgit:git-tag[1]
> linkgit:git-branch[1]
> linkgit:git[1]
> -- 
> 1.8.4.rc1.31.g530f5ce.dirty
>
>
>