diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-06-01 01:22:40 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-06-01 01:22:40 +0000 |
| commit | 3d14151d12d04345e1ba88a918c55ba430d87503 (patch) | |
| tree | 69178c5f22377a44b906f7d19906c1ca45d0cd37 /git-mktree.html | |
| parent | 7d3275ed7fbf0a517277af446e8c3c6226fa7702 (diff) | |
| download | git-htmldocs-3d14151d12d04345e1ba88a918c55ba430d87503.tar.gz | |
Autogenerated HTML docs for v1.6.3.1-244-gf9275
Diffstat (limited to 'git-mktree.html')
| -rw-r--r-- | git-mktree.html | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/git-mktree.html b/git-mktree.html index 60153036a..17d8aeb5e 100644 --- a/git-mktree.html +++ b/git-mktree.html @@ -320,12 +320,13 @@ git-mktree(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<div class="para"><p><em>git mktree</em> [-z]</p></div>
+<div class="para"><p><em>git mktree</em> [-z] [--missing] [--batch]</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>Reads standard input in non-recursive <tt>ls-tree</tt> output format,
-and creates a tree object. The object name of the tree object
+<div class="para"><p>Reads standard input in non-recursive <tt>ls-tree</tt> output format, and creates
+a tree object. The order of the tree entries is normalised by mktree so
+pre-sorting the input is not required. The object name of the tree object
built is written to the standard output.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
@@ -339,6 +340,28 @@ built is written to the standard output.</p></div> Read the NUL-terminated <tt>ls-tree -z</tt> output instead.
</p>
</dd>
+<dt>
+--missing
+</dt>
+<dd>
+<p>
+ Allow missing objects. The default behaviour (without this option)
+ is to verify that each tree entry's sha1 identifies an existing
+ object. This option has no effect on the treatment of gitlink entries
+ (aka "submodules") which are always allowed to be missing.
+</p>
+</dd>
+<dt>
+--batch
+</dt>
+<dd>
+<p>
+ Allow building of more than one tree object before exiting. Each
+ tree is separated by as single blank line. The final new-line is
+ optional. Note - if the <em>-z</em> option is used, lines are terminated
+ with NUL.
+</p>
+</dd>
</dl></div>
</div>
<h2 id="_author">Author</h2>
@@ -355,7 +378,7 @@ built is written to the standard output.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-04-02 06:49:58 UTC
+Last updated 2009-06-01 01:22:21 UTC
</div>
</div>
</body>
|