summaryrefslogtreecommitdiff
path: root/Documentation/git-replace.txt
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2014-07-19 15:01:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-21 19:05:47 (GMT)
commit78024c4e31d04cd2bdc0d734ede2d24bb33c72ef (patch)
treef75efbb263d1a68b317c3d1643d0fe310d4e2ed9 /Documentation/git-replace.txt
parentadf8e5423891fa9bd04fcb0489ffb5da7025ec07 (diff)
downloadgit-78024c4e31d04cd2bdc0d734ede2d24bb33c72ef.zip
git-78024c4e31d04cd2bdc0d734ede2d24bb33c72ef.tar.gz
git-78024c4e31d04cd2bdc0d734ede2d24bb33c72ef.tar.bz2
Documentation: replace: add --graft option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-replace.txt')
-rw-r--r--Documentation/git-replace.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 61461b9..491875e 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt
@@ -10,6 +10,7 @@ SYNOPSIS
[verse]
'git replace' [-f] <object> <replacement>
'git replace' [-f] --edit <object>
+'git replace' [-f] --graft <commit> [<parent>...]
'git replace' -d <object>...
'git replace' [--format=<format>] [-l [<pattern>]]
@@ -73,6 +74,13 @@ OPTIONS
newly created object. See linkgit:git-var[1] for details about
how the editor will be chosen.
+--graft <commit> [<parent>...]::
+ Create a graft commit. A new commit is created with the same
+ content as <commit> except that its parents will be
+ [<parent>...] instead of <commit>'s parents. A replacement ref
+ is then created to replace <commit> with the newly created
+ commit.
+
-l <pattern>::
--list <pattern>::
List replace refs for objects that match the given pattern (or