diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-07-27 16:13:00 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-07-27 16:13:00 -0700 |
commit | d9421afa642bada4b619d72a33e5db78cd42d418 (patch) | |
tree | 04a90d9c287b90f26cd41ff121441d6226ff094d /git-replace.txt | |
parent | 7b43d41db10d299c065a9c85efa04603d35acb74 (diff) | |
download | git-htmldocs-d9421afa642bada4b619d72a33e5db78cd42d418.tar.gz |
Autogenerated HTML docs for v2.1.0-rc0
Diffstat (limited to 'git-replace.txt')
-rw-r--r-- | git-replace.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/git-replace.txt b/git-replace.txt index 089dcac04..8fff598fd 100644 --- a/git-replace.txt +++ b/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>]] @@ -81,6 +82,15 @@ OPTIONS cannot be pretty-printed. Note that you may need to configure your editor to cleanly read and write binary data. +--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. 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>:: List replace refs for objects that match the given pattern (or |