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>
Josh Micich committed
May 14, 2009 at 12:46 UTC
e01662bb5da721d65226f4b173858ea3bf0bde30
2 files changed
+11
-4
Documentation/git-mktree.txt
+10
-3
@@ -8,12 +8,13 @@ git-mktree - Build a tree-object from ls-tree formatted text
8
9
SYNOPSIS
10
--------
11
-'git mktree' [-z]
11
+'git mktree' [-z] [--missing]
12
13
DESCRIPTION
14
-----------
15
-Reads standard input in non-recursive `ls-tree` output format,
16
-and creates a tree object. The object name of the tree object
15
+Reads standard input in non-recursive `ls-tree` output format, and creates
16
+a tree object. The order of the tree entries is normalised by mktree so
17
+pre-sorting the input is not required. The object name of the tree object
18
built is written to the standard output.
19
20
OPTIONS
@@ -21,6 +22,12 @@ OPTIONS
22
-z::
23
Read the NUL-terminated `ls-tree -z` output instead.
24
25
+--missing::
26
+ Allow missing objects. The default behaviour (without this option)
27
+ is to verify that each tree entry's sha1 identifies an existing
28
+ object. This option has no effect on the treatment of gitlink entries
29
+ (aka "submodules") which are always allowed to be missing.
30
+
31
Author
32
------
33
Written by Junio C Hamano <gitster@pobox.com>
builtin-mktree.c
+1
-1
@@ -63,7 +63,7 @@ static void write_tree(unsigned char *sha1)
63
}
64
65
static const char *mktree_usage[] = {
66
- "git mktree [-z]",
66
+ "git mktree [-z] [--missing]",
67
NULL
68
};
69