X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-parse.c;h=19a5ef7f48a722c44a3534f281581f9a6ed08e84;hb=f4e96f97e85c145616bc2e23e9441bc0daa2906e;hp=a5fb93c3ca993dc240f87a9ac5ee6447b10b7cad;hpb=ee072260dbff6914c24d956bcc2d46882831f1a0;p=git.git

diff --git a/rev-parse.c b/rev-parse.c
index a5fb93c3..19a5ef7f 100644
--- 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",
@@ -167,6 +166,8 @@ int main(int argc, char **argv)
 	unsigned char sha1[20];
 	const char *prefix = setup_git_directory();
 	
+	git_config(git_default_config);
+
 	for (i = 1; i < argc; i++) {
 		struct stat st;
 		char *arg = argv[i];