summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2014-07-19 17:01:11 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-07-21 12:05:53 -0700
commitb0ab2b71d0baa845e6920a3146df65f5cd296ea0 (patch)
tree130af4c8c35e1cc3e2b72e306a8ceeaa65fcb8b4 /Documentation
parentDocumentation: replace: add --graft option (diff)
downloadtgif-b0ab2b71d0baa845e6920a3146df65f5cd296ea0.tar.xz
contrib: add convert-grafts-to-replace-refs.sh
This patch adds into contrib/ an example script to convert grafts from an existing grafts file into replace refs using the new --graft option of "git replace". While at it let's mention this new script in the "git replace" documentation for the --graft option. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-replace.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 491875e77d..e1be2e6270 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt
@@ -79,7 +79,9 @@ OPTIONS
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.
+ commit. See contrib/convert-grafts-to-replace-refs.sh for an
+ example script based on this option that can convert grafts to
+ replace refs.
-l <pattern>::
--list <pattern>::