From 4e4b125c239a78f3a8fe82e47d1f89fef510980c Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 17 May 2014 14:16:39 +0200 Subject: [PATCH] Documentation: replace: describe new --edit option Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/git-replace.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 0a02f70657..61461b9f33 100644 --- a/Documentation/git-replace.txt +++ b/Documentation/git-replace.txt @@ -9,6 +9,7 @@ SYNOPSIS -------- [verse] 'git replace' [-f] +'git replace' [-f] --edit 'git replace' -d ... 'git replace' [--format=] [-l []] @@ -63,6 +64,15 @@ OPTIONS --delete:: Delete existing replace refs for the given objects. +--edit :: + Edit an object's content interactively. The existing content + for is pretty-printed into a temporary file, an + editor is launched on the file, and the result is parsed to + create a new object of the same type as . A + replacement ref is then created to replace with the + newly created object. See linkgit:git-var[1] for details about + how the editor will be chosen. + -l :: --list :: List replace refs for objects that match the given pattern (or @@ -92,7 +102,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 +129,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