summaryrefslogtreecommitdiffstats
path: root/git-notes.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-05 15:38:06 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-05 15:38:06 -0800
commitfad84129b4a5c4269d078ca268c893969973c5d6 (patch)
tree9d06f17f5f06dc39e8b619f244da9be741de04db /git-notes.html
parent7c4741cf911342df5374f4788be6667f875808f6 (diff)
downloadgit-htmldocs-fad84129b4a5c4269d078ca268c893969973c5d6.tar.gz
Autogenerated HTML docs for v2.2.0-33-gc18b86
Diffstat (limited to 'git-notes.html')
-rw-r--r--git-notes.html19
1 files changed, 14 insertions, 5 deletions
diff --git a/git-notes.html b/git-notes.html
index 67ea474f6..56ef80230 100644
--- a/git-notes.html
+++ b/git-notes.html
@@ -749,10 +749,10 @@ git-notes(1) Manual Page
<div class="sectionbody">
<div class="verseblock">
<pre class="content"><em>git notes</em> [list [&lt;object&gt;]]
-<em>git notes</em> add [-f] [-F &lt;file&gt; | -m &lt;msg&gt; | (-c | -C) &lt;object&gt;] [&lt;object&gt;]
+<em>git notes</em> add [-f] [--allow-empty] [-F &lt;file&gt; | -m &lt;msg&gt; | (-c | -C) &lt;object&gt;] [&lt;object&gt;]
<em>git notes</em> copy [-f] ( --stdin | &lt;from-object&gt; &lt;to-object&gt; )
-<em>git notes</em> append [-F &lt;file&gt; | -m &lt;msg&gt; | (-c | -C) &lt;object&gt;] [&lt;object&gt;]
-<em>git notes</em> edit [&lt;object&gt;]
+<em>git notes</em> append [--allow-empty] [-F &lt;file&gt; | -m &lt;msg&gt; | (-c | -C) &lt;object&gt;] [&lt;object&gt;]
+<em>git notes</em> edit [--allow-empty] [&lt;object&gt;]
<em>git notes</em> show [&lt;object&gt;]
<em>git notes</em> merge [-v | -q] [-s &lt;strategy&gt; ] &lt;notes-ref&gt;
<em>git notes</em> merge --commit [-v | -q]
@@ -982,6 +982,15 @@ get-ref
</p>
</dd>
<dt class="hdlist1">
+--allow-empty
+</dt>
+<dd>
+<p>
+ Allow an empty note object to be stored. The default behavior is
+ to automatically remove empty notes.
+</p>
+</dd>
+<dt class="hdlist1">
--ref &lt;ref&gt;
</dt>
<dd>
@@ -1161,7 +1170,7 @@ arbitrary files using <em>git hash-object</em>:</p></div>
<div class="content">
<pre><code>$ cc *.c
$ blob=$(git hash-object -w a.out)
-$ git notes --ref=built add -C "$blob" HEAD</code></pre>
+$ git notes --ref=built add --allow-empty -C "$blob" HEAD</code></pre>
</div></div>
<div class="paragraph"><p>(You cannot simply use <code>git notes --ref=built add -F a.out HEAD</code>
because that is not binary-safe.)
@@ -1304,7 +1313,7 @@ on the <code>notes.rewrite.&lt;command&gt;</code> and <code>notes.rewriteRef</co
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-04-08 12:47:26 PDT
+Last updated 2014-12-05 15:37:36 PST
</div>
</div>
</body>