Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: replace: add --graft option
author
Christian Couder
<chriscool@tuxfamily.org>
Sat, 19 Jul 2014 15:01:10 +0000
(17:01 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 21 Jul 2014 19:05:47 +0000
(12:05 -0700)
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-replace.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
adf8e54
)
diff --git
a/Documentation/git-replace.txt
b/Documentation/git-replace.txt
index 61461b9f3399bd99547407ae0f3ccb4a38b77582..491875e77d9a6c14d664a389576ff646f24ca2d3 100644
(file)
--- 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>
[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>]]
'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.
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
-l <pattern>::
--list <pattern>::
List replace refs for objects that match the given pattern (or