summaryrefslogtreecommitdiffstats
path: root/git-fast-export.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-24 18:02:58 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-24 18:02:58 -0700
commitac002b631c16db5b744b6bfdc5d5599cf1cf254b (patch)
treecad41b2d47ee9302596b8364a5cb34cb968547f3 /git-fast-export.html
parent04e768d545466d56b5c08479f45e7002f2a77d69 (diff)
downloadgit-htmldocs-ac002b631c16db5b744b6bfdc5d5599cf1cf254b.tar.gz
Autogenerated HTML docs for v1.8.2.1-628-gcd33b
Diffstat (limited to 'git-fast-export.html')
-rw-r--r--git-fast-export.html12
1 files changed, 7 insertions, 5 deletions
diff --git a/git-fast-export.html b/git-fast-export.html
index be737c3ac..5aa199581 100644
--- a/git-fast-export.html
+++ b/git-fast-export.html
@@ -775,7 +775,7 @@ into <em>git fast-import</em>.</p></div>
</p>
</dd>
<dt class="hdlist1">
---signed-tags=(verbatim|warn|strip|abort)
+--signed-tags=(verbatim|warn|warn-strip|strip|abort)
</dt>
<dd>
<p>
@@ -784,9 +784,11 @@ into <em>git fast-import</em>.</p></div>
when excluding revisions) the signatures will not match.
</p>
<div class="paragraph"><p>When asking to <em>abort</em> (which is the default), this program will die
-when encountering a signed tag. With <em>strip</em>, the tags will be made
-unsigned, with <em>verbatim</em>, they will be silently exported
-and with <em>warn</em>, they will be exported, but you will see a warning.</p></div>
+when encountering a signed tag. With <em>strip</em>, the tags will silently
+be made unsigned, with <em>warn-strip</em> they will be made unsigned but a
+warning will be displayed, with <em>verbatim</em>, they will be silently
+exported and with <em>warn</em>, they will be exported, but you will see a
+warning.</p></div>
</dd>
<dt class="hdlist1">
--tag-of-filtered-object=(abort|drop|rewrite)
@@ -949,7 +951,7 @@ a tag referencing a tree instead of a commit.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-04-07 16:36:03 PDT
+Last updated 2013-04-24 18:02:34 PDT
</div>
</div>
</body>