Merge branch 'maint'

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index f458cb7587c7d40cf93d42d73379fac485ee3889..9bfb94201f298f5902c6da13b12f4ca539bb86ed 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -16,6 +16,10 @@ static const char rev_list_usage[] =
 "    --min-age=<epoch>\n"
 "    --sparse\n"
 "    --no-merges\n"
+"    --min-parents=<n>\n"
+"    --no-min-parents\n"
+"    --max-parents=<n>\n"
+"    --no-max-parents\n"
 "    --remove-empty\n"
 "    --all\n"
 "    --branches\n"