Merge branch 'jc/name' into next

[git.git] / rev-parse.c

diff --git a/rev-parse.c b/rev-parse.c
index a5fb93c3ca993dc240f87a9ac5ee6447b10b7cad..f90e999e607d238fbfe17e84f286570c04844100 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -39,13 +39,12 @@ static int is_rev_argument(const char *arg)
                "--header",
                "--max-age=",
                "--max-count=",
-               "--merge-order",
                "--min-age=",
                "--no-merges",
                "--objects",
+               "--objects-edge",
                "--parents",
                "--pretty",
-               "--show-breaks",
                "--sparse",
                "--topo-order",
                "--date-order",