X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-tree.c;h=1c3b09beffdf347af40b385f632d481c99645a33;hb=9bc8b776c54e9b4c3b753639b4ae70acb2ff8db6;hp=c56b572d05266bb6eeae394184708d2075945d18;hpb=df45467ec98aa1c532196732c96a62589223353e;p=git.git

diff --git a/read-tree.c b/read-tree.c
index c56b572d..1c3b09be 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -337,7 +337,7 @@ static void check_updates(struct cache_entry **src, int nr)
 		if (ce->ce_flags & mask) {
 			ce->ce_flags &= ~mask;
 			if (update)
-				checkout_entry(ce, &state);
+				checkout_entry(ce, &state, NULL);
 		}
 	}
 	if (total) {
@@ -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;