Merge branch 'jk/blame-commit-label' into maint

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 35d3c43ed656bf28b78501426f4502c0dff1e7b0..95328b80d930260915ad86a30a21ecd3c1b7d1f4 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -279,7 +279,7 @@ static int try_difference(const char *arg)
                        struct commit *a, *b;
                        a = lookup_commit_reference(sha1);
                        b = lookup_commit_reference(end);
-                       exclude = get_merge_bases(a, b, 1);
+                       exclude = get_merge_bases(a, b);
                        while (exclude) {
                                struct commit_list *n = exclude->next;
                                show_rev(REVERSED,