Allow the user to control the verbosity of merge-recursive.

diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
index c7712748bc034ba7ef39bc3b993093bea012d084..3b716fba133ae2f0375ef73d6a50a4d93112b5e4 100644 (file)
--- a/builtin-rev-parse.c
+++ b/builtin-rev-parse.c
@@ -137,7 +137,7 @@ static void show_default(void)
        }
 }
 
-static int show_reference(const char *refname, const unsigned char *sha1, void *cb_data)
+static int show_reference(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 {
        show_rev(NORMAL, sha1, refname);
        return 0;