From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Philip Oakley <philipoakley@iee.orcg>,
Thomas Rast <trast@inf.ethz.ch>
Subject: [PATCH 5/5] Documentation/replace: add Creating Replacement Objects section
Date: Sun, 25 Aug 2013 15:06:08 +0200 [thread overview]
Message-ID: <20130825130609.4681.95932.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20130825125940.4681.70226.chriscool@tuxfamily.org>
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], 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.24.g13dc82a
prev parent reply other threads:[~2013-08-25 13:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-25 13:06 [PATCH 0/5] Check replacement object type and minor updates Christian Couder
2013-08-25 13:06 ` [PATCH 1/5] replace: forbid replacing an object with one of a different type Christian Couder
2013-08-25 18:35 ` Johannes Sixt
2013-08-25 19:44 ` Christian Couder
2013-08-25 20:18 ` Johannes Sixt
2013-08-26 7:19 ` Christian Couder
2013-08-25 13:06 ` [PATCH 2/5] Documentation/replace: state that objects must be of the same type Christian Couder
2013-08-25 13:06 ` [PATCH 3/5] t6050-replace: test that objects are " Christian Couder
2013-08-25 20:06 ` Johannes Sixt
2013-08-25 13:06 ` [PATCH 4/5] t6050-replace: add test to clean up all the replace refs Christian Couder
2013-08-25 13:06 ` Christian Couder [this message]
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=20130825130609.4681.95932.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philipoakley@iee.orcg \
--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).