aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-mktree.txt
diff options
context:
space:
mode:
authorJosh Micich <josh.micich@gmail.com>2009-05-14 12:46:03 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-16 10:25:49 -0700
commite01662bb5da721d65226f4b173858ea3bf0bde30 (patch)
tree1e6727a6354c47c667e2d4bd74868dde96eb09cd /Documentation/git-mktree.txt
parent1c64e79a622b43cff2d919632393c51f3fcc4f43 (diff)
downloadgit-e01662bb5da721d65226f4b173858ea3bf0bde30.tar.gz
git-e01662bb5da721d65226f4b173858ea3bf0bde30.tar.xz
mktree --missing: updated usage message and man page
Update usage message in builtin-mktree.c to include '--missing'. Do the same to man page and clarify that the input does not have to be sorted. Signed-off-by: Josh Micich <josh.micich@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mktree.txt')
-rw-r--r--Documentation/git-mktree.txt13
1 files changed, 10 insertions, 3 deletions
diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
index af19f06ed..7336f48bd 100644
--- a/Documentation/git-mktree.txt
+++ b/Documentation/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]
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,12 @@ 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.
+
Author
------
Written by Junio C Hamano <gitster@pobox.com>