git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: [PATCH v2 10/10] Documentation: replace: describe new --edit option
Date: Sat, 17 May 2014 08:41:32 +0200	[thread overview]
Message-ID: <20140517064133.18932.96622.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140517062418.18932.21200.chriscool@tuxfamily.org>

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 Documentation/git-replace.txt | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 0a02f70..37d872d 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt
@@ -9,6 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git replace' [-f] <object> <replacement>
+'git replace' [-f] --edit <object>
 'git replace' -d <object>...
 'git replace' [--format=<format>] [-l [<pattern>]]
 
@@ -63,6 +64,14 @@ OPTIONS
 --delete::
 	Delete existing replace refs for the given objects.
 
+--edit <object>::
+	Launch an editor to let the user change the content of
+	<object>, then create a new object of the same type with the
+	changed content, and create a replace ref to replace <object>
+	with the new object. See linkgit:git-commit[1] and
+	linkgit:git-var[1] for details about how the editor will be
+	chosen.
+
 -l <pattern>::
 --list <pattern>::
 	List replace refs for objects that match the given pattern (or
@@ -92,7 +101,9 @@ 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.
+replacement objects from existing objects. The `--edit` option can
+also be used with 'git replace' to create a replacement object by
+editing an existing object.
 
 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
@@ -117,6 +128,8 @@ linkgit:git-filter-branch[1]
 linkgit:git-rebase[1]
 linkgit:git-tag[1]
 linkgit:git-branch[1]
+linkgit:git-commit[1]
+linkgit:git-var[1]
 linkgit:git[1]
 
 GIT
-- 
1.9.rc0.17.g651113e

  parent reply	other threads:[~2014-05-17  6:44 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-17  6:41 [PATCH v2 00/10] replace: add option to edit a Git object Christian Couder
2014-05-17  6:41 ` [PATCH v2 01/10] replace: refactor command-mode determination Christian Couder
2014-05-17  6:41 ` [PATCH v2 02/10] replace: use OPT_CMDMODE to handle modes Christian Couder
2014-05-17  6:41 ` [PATCH v2 03/10] replace: factor object resolution out of replace_object Christian Couder
2014-05-17  6:41 ` [PATCH v2 04/10] replace: add --edit option Christian Couder
2014-05-17  6:41 ` [PATCH v2 05/10] replace: make sure --edit results in a different object Christian Couder
2014-05-17  7:03   ` Jeff King
2014-05-17  6:41 ` [PATCH v2 06/10] replace: refactor checking ref validity Christian Couder
2014-05-17  6:41 ` [PATCH v2 07/10] replace: die early if replace ref already exists Christian Couder
2014-05-17  7:05   ` Jeff King
2014-05-17  6:41 ` [PATCH v2 08/10] replace: add tests for --edit Christian Couder
2014-05-17  7:14   ` Jeff King
2014-05-17  6:41 ` [PATCH v2 09/10] replace: add --edit to usage string Christian Couder
2014-05-17  6:41 ` Christian Couder [this message]
2014-05-17  7:23   ` [PATCH v2 10/10] Documentation: replace: describe new --edit option Jeff King
2014-05-17  7:24 ` [PATCH v2 00/10] replace: add option to edit a Git object Jeff King

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=20140517064133.18932.96622.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /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).