Document -i flag to git-read-tree

Somehow I missed it when we updated read-tree to support the recursive
merge strategy.  Also -i should require -m as well, which the command
did not check.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-09-19 11:33:14 -07:00
parent a7154e916c
commit f318dd229f
2 changed files with 12 additions and 2 deletions

View File

@ -655,7 +655,7 @@ int main(int argc, char **argv)
die("failed to unpack tree object %s", arg);
stage++;
}
if (update && !merge)
if ((update||index_only) && !merge)
usage(read_tree_usage);
if (merge && !fn) {
if (stage < 2)