Document -i flag to git-read-tree
authorJunio C Hamano <junkio@cox.net>
Mon, 19 Sep 2005 18:33:14 +0000 (11:33 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 20 Sep 2005 22:07:52 +0000 (15:07 -0700)
commitf318dd229f9df88470de8541916d48c9380e2e35
treeac0d21f1e1711c5b1adfdaed59056200aa0bd84f
parenta7154e916c6fab01dfb67629dae8c4430daff669
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>
Documentation/git-read-tree.txt
read-tree.c