log: show merge commit when --cc is given

diff --git a/reflog-walk.h b/reflog-walk.h
index a9bd60e32d24bf61cbc2ea879b5bfd0e0e5c5c61..27886f793e75de484b2a3c168e6024cf4139aae3 100644 (file)
--- a/reflog-walk.h
+++ b/reflog-walk.h
@@ -11,13 +11,13 @@ extern int add_reflog_for_walk(struct reflog_walk_info *info,
 extern void fake_reflog_parent(struct reflog_walk_info *info,
                struct commit *commit);
 extern void show_reflog_message(struct reflog_walk_info *info, int,
-                               enum date_mode, int force_date);
+                               const struct date_mode *, int force_date);
 extern void get_reflog_message(struct strbuf *sb,
                struct reflog_walk_info *reflog_info);
 extern const char *get_reflog_ident(struct reflog_walk_info *reflog_info);
 extern void get_reflog_selector(struct strbuf *sb,
                struct reflog_walk_info *reflog_info,
-               enum date_mode dmode, int force_date,
+               const struct date_mode *dmode, int force_date,
                int shorten);
 
 #endif