Merge branch 'maint'

diff --git a/read-tree.c b/read-tree.c
index da0fcf035e97ce0d362237c73993e6bf4c4de4ff..be29b3fe11a370e53d3dce6a43dfccdc0e22ae2c 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -404,7 +404,7 @@ static void verify_uptodate(struct cache_entry *ce)
                return;
 
        if (!lstat(ce->name, &st)) {
-               unsigned changed = ce_match_stat(ce, &st);
+               unsigned changed = ce_match_stat(ce, &st, 1);
                if (!changed)
                        return;
                errno = 0;
@@ -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;