git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: philipoakley@iee.org
Cc: gitster@pobox.com, git@vger.kernel.org, trast@inf.ethz.ch, j6t@kdbg.org
Subject: Re: [PATCH v3 05/11] Documentation/replace: add Creating Replacement Objects section
Date: Sun, 01 Sep 2013 12:27:16 +0200 (CEST)	[thread overview]
Message-ID: <20130901.122716.141236934846069455.chriscool@tuxfamily.org> (raw)
In-Reply-To: <23F4E42FEAEB41DCA9B6F18EED5DD4D0@PhilipOakley>

From: "Philip Oakley" <philipoakley@iee.org>
>
> 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.

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

  reply	other threads:[~2013-09-01 10:27 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-31 19:12 [PATCH v3 00/11] Check replacement object type and minor updates Christian Couder
2013-08-31 19:12 ` [PATCH v3 01/11] replace: forbid replacing an object with one of a different type Christian Couder
2013-08-31 22:11   ` Philip Oakley
2013-09-01 11:53     ` Christian Couder
2013-09-01 19:26       ` Philip Oakley
2013-08-31 19:12 ` [PATCH v3 02/11] Documentation/replace: state that objects must be of the same type Christian Couder
2013-08-31 19:12 ` [PATCH v3 03/11] t6050-replace: test that objects are " Christian Couder
2013-08-31 19:12 ` [PATCH v3 04/11] t6050-replace: add test to clean up all the replace refs Christian Couder
2013-08-31 19:12 ` [PATCH v3 05/11] Documentation/replace: add Creating Replacement Objects section Christian Couder
2013-08-31 22:19   ` Philip Oakley
2013-09-01 10:27     ` Christian Couder [this message]
2013-08-31 19:12 ` [PATCH v3 06/11] replace: bypass the type check if -f option is used Christian Couder
2013-08-31 19:12 ` [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check Christian Couder
2013-08-31 22:16   ` Philip Oakley
2013-09-01 11:49     ` Christian Couder
2013-09-01 20:11       ` Philip Oakley
2013-09-02  6:11         ` Christian Couder
2013-09-02 21:50           ` Philip Oakley
2013-09-02 21:55             ` Jonathan Nieder
2013-09-02 22:13               ` Philip Oakley
2013-09-02 22:26                 ` Jonathan Nieder
2013-09-02 22:45                   ` Philip Oakley
2013-09-03  9:29             ` Christian Couder
2013-08-31 19:12 ` [PATCH v3 08/11] t6050-replace: check " Christian Couder
2013-09-01  7:50   ` Eric Sunshine
2013-09-01 10:02     ` Christian Couder
2013-08-31 19:12 ` [PATCH v3 09/11] replace: allow long option names Christian Couder
2013-08-31 19:12 ` [PATCH v3 10/11] Documentation/replace: list " Christian Couder
2013-08-31 19:12 ` [PATCH v3 11/11] t6050-replace: use some " Christian Couder
2013-08-31 22:19   ` Philip Oakley
2013-09-01 10:11     ` Christian Couder
2013-09-01  8:07   ` Eric Sunshine
2013-09-01 10:01     ` Christian Couder

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=20130901.122716.141236934846069455.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=philipoakley@iee.org \
    --cc=trast@inf.ethz.ch \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).