summaryrefslogtreecommitdiffstats
path: root/git-mktree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-06-01 01:22:40 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-06-01 01:22:40 +0000
commit3d14151d12d04345e1ba88a918c55ba430d87503 (patch)
tree69178c5f22377a44b906f7d19906c1ca45d0cd37 /git-mktree.txt
parent7d3275ed7fbf0a517277af446e8c3c6226fa7702 (diff)
downloadgit-htmldocs-3d14151d12d04345e1ba88a918c55ba430d87503.tar.gz
Autogenerated HTML docs for v1.6.3.1-244-gf9275
Diffstat (limited to 'git-mktree.txt')
-rw-r--r--git-mktree.txt19
1 files changed, 16 insertions, 3 deletions
diff --git a/git-mktree.txt b/git-mktree.txt
index af19f06ed..81e332677 100644
--- a/git-mktree.txt
+++ b/git-mktree.txt
@@ -8,12 +8,13 @@ git-mktree - Build a tree-object from ls-tree formatted text
SYNOPSIS
--------
-'git mktree' [-z]
+'git mktree' [-z] [--missing] [--batch]
DESCRIPTION
-----------
-Reads standard input in non-recursive `ls-tree` output format,
-and creates a tree object. The object name of the tree object
+Reads standard input in non-recursive `ls-tree` 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.
OPTIONS
@@ -21,6 +22,18 @@ OPTIONS
-z::
Read the NUL-terminated `ls-tree -z` output instead.
+--missing::
+ 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.
+
+--batch::
+ 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 '-z' option is used, lines are terminated
+ with NUL.
+
Author
------
Written by Junio C Hamano <gitster@pobox.com>