X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=read-tree.c;h=be29b3fe11a370e53d3dce6a43dfccdc0e22ae2c;hb=cd1333db4f41c44930884176601a8f7725fdd0fa;hp=c56b572d05266bb6eeae394184708d2075945d18;hpb=2486927d2ec9cc05ed7589540d103382d3751c10;p=git.git diff --git a/read-tree.c b/read-tree.c index c56b572d..be29b3fe 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 ( | -m [-u | -i] [ []])"; +static const char read_tree_usage[] = "git-read-tree ( | -m [--aggressive] [-u | -i] [ []])"; static struct cache_file cache_file;