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>
This commit is contained in:
Josh Micich 2009-05-14 12:46:03 -07:00 committed by Junio C Hamano
parent 1c64e79a62
commit e01662bb5d
2 changed files with 11 additions and 4 deletions

View File

@ -8,12 +8,13 @@ git-mktree - Build a tree-object from ls-tree formatted text
SYNOPSIS SYNOPSIS
-------- --------
'git mktree' [-z] 'git mktree' [-z] [--missing]
DESCRIPTION DESCRIPTION
----------- -----------
Reads standard input in non-recursive `ls-tree` output format, Reads standard input in non-recursive `ls-tree` output format, and creates
and creates a tree object. The object name of the tree object 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. built is written to the standard output.
OPTIONS OPTIONS
@ -21,6 +22,12 @@ OPTIONS
-z:: -z::
Read the NUL-terminated `ls-tree -z` output instead. 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 Author
------ ------
Written by Junio C Hamano <gitster@pobox.com> Written by Junio C Hamano <gitster@pobox.com>

View File

@ -63,7 +63,7 @@ static void write_tree(unsigned char *sha1)
} }
static const char *mktree_usage[] = { static const char *mktree_usage[] = {
"git mktree [-z]", "git mktree [-z] [--missing]",
NULL NULL
}; };