Documentation: read-tree --aggressive

Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-02 01:11:05 -08:00
parent 8273c79ae2
commit afaa8d66ab
2 changed files with 15 additions and 2 deletions
--- a/read-tree.c
+++ b/read-tree.c
@ -706,7 +706,7 @@ static int read_cache_unmerged(void)
 	return deleted;
 }

-static const char read_tree_usage[] = "git-read-tree (<sha> | -m [-u | -i] <sha1> [<sha2> [<sha3>]])";
+static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])";

 static struct cache_file cache_file;