Rip out merge-order and make "git log <paths>..." work again.

[thirdparty/git.git] / rev-parse.c

diff --git a/rev-parse.c b/rev-parse.c
index 610eacb35a2ebc5b64b48ae02367543fa2fbb67a..f90e999e607d238fbfe17e84f286570c04844100 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -39,14 +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",