summaryrefslogtreecommitdiff
path: root/read-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-19 18:33:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-20 22:07:52 (GMT)
commitf318dd229f9df88470de8541916d48c9380e2e35 (patch)
treeac0d21f1e1711c5b1adfdaed59056200aa0bd84f /read-tree.c
parenta7154e916c6fab01dfb67629dae8c4430daff669 (diff)
downloadgit-f318dd229f9df88470de8541916d48c9380e2e35.zip
git-f318dd229f9df88470de8541916d48c9380e2e35.tar.gz
git-f318dd229f9df88470de8541916d48c9380e2e35.tar.bz2
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 'read-tree.c')
-rw-r--r--read-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/read-tree.c b/read-tree.c
index 6a5c08c..ca80873 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)