summaryrefslogtreecommitdiff
path: root/read-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-02 01:11:05 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-02 01:11:05 -0800
commitafaa8d66ab542de0c3f6d00aaacdf0ecfa78ff33 (patch)
treec733a837ad315b926f8645371305f2ef1e14224b /read-tree.c
parent8273c79ae2e6b782dba3dccb815b386cc83e4294 (diff)
downloadgit-afaa8d66ab542de0c3f6d00aaacdf0ecfa78ff33.tar.gz
Documentation: read-tree --aggressive
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 c56b572d05..be29b3fe11 100644
--- 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;