diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-19 20:33:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-21 00:07:52 +0200 |
| commit | f318dd229f9df88470de8541916d48c9380e2e35 (patch) | |
| tree | ac0d21f1e1711c5b1adfdaed59056200aa0bd84f /read-tree.c | |
| parent | [PATCH] Documentation: Update all files to use the new gitlink: macro (diff) | |
| download | git-f318dd229f9df88470de8541916d48c9380e2e35.tar.xz git-f318dd229f9df88470de8541916d48c9380e2e35.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | read-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-tree.c b/read-tree.c index 6a5c08c4c6..ca808739db 100644 --- a/read-tree.c +++ b/read-tree.c @@ -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) |