Merge git-mv fixes from 'maint'

diff --git a/rev-parse.c b/rev-parse.c
index a5fb93c3ca993dc240f87a9ac5ee6447b10b7cad..610eacb35a2ebc5b64b48ae02367543fa2fbb67a 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -43,6 +43,7 @@ static int is_rev_argument(const char *arg)
                "--min-age=",
                "--no-merges",
                "--objects",
+               "--objects-edge",
                "--parents",
                "--pretty",
                "--show-breaks",