Merge branch 'jc/name' into next

diff --git a/rev-parse.c b/rev-parse.c
index 610eacb35a2ebc5b64b48ae02367543fa2fbb67a..19a5ef7f48a722c44a3534f281581f9a6ed08e84 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",
@@ -168,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];