diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
| commit | b9d9d90d180cf21baeeb16bd89828d25c7901470 (patch) | |
| tree | a40241052af8d4f5543b66581e3f0235cfae0af3 /git-replace.html | |
| parent | ccb8252b46bfba5daf0cfcedaf0f9d2e14ba356f (diff) | |
| download | git-htmldocs-b9d9d90d180cf21baeeb16bd89828d25c7901470.tar.gz | |
Autogenerated HTML docs for v2.17.0-775-ge144d
Diffstat (limited to 'git-replace.html')
| -rw-r--r-- | git-replace.html | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/git-replace.html b/git-replace.html index c8b8d54a8..9cd835240 100644 --- a/git-replace.html +++ b/git-replace.html @@ -1,9 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 8.6.10" />
<title>git-replace(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -751,6 +752,7 @@ git-replace(1) Manual Page <pre class="content"><em>git replace</em> [-f] <object> <replacement>
<em>git replace</em> [-f] --edit <object>
<em>git replace</em> [-f] --graft <commit> [<parent>…]
+<em>git replace</em> [-f] --convert-graft-file
<em>git replace</em> -d <object>…
<em>git replace</em> [--format=<format>] [-l [<pattern>]]</pre>
<div class="attribution">
@@ -852,9 +854,18 @@ achieve the same effect as the <code>--no-replace-objects</code> option.</p></di 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.
+ commit. Use <code>--convert-graft-file</code> to convert a
+ <code>$GIT_DIR/info/grafts</code> file and use replace refs instead.
+</p>
+</dd>
+<dt class="hdlist1">
+--convert-graft-file
+</dt>
+<dd>
+<p>
+ Creates graft commits for all entries in <code>$GIT_DIR/info/grafts</code>
+ and deletes that file upon success. The purpose is to help users
+ with transitioning off of the now-deprecated graft file.
</p>
</dd>
<dt class="hdlist1">
@@ -960,7 +971,7 @@ pending objects.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2018-05-23 16:06:29 JST
</div>
</div>
</body>
|