Merge branch 'ab/hash-object-doc' into maint

diff --git a/reflog-walk.h b/reflog-walk.h
index cb3e73755d445b866ad51246dc8b1ea3ab6f1639..f26408f6cc1caffd93949ebc95d74426c2a9db25 100644 (file)
--- a/reflog-walk.h
+++ b/reflog-walk.h
@@ -6,21 +6,21 @@
 struct commit;
 struct reflog_walk_info;
 
-extern void init_reflog_walk(struct reflog_walk_info **info);
-extern int add_reflog_for_walk(struct reflog_walk_info *info,
-               struct commit *commit, const char *name);
-extern void show_reflog_message(struct reflog_walk_info *info, int,
-                               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 timestamp_t get_reflog_timestamp(struct reflog_walk_info *reflog_info);
-extern void get_reflog_selector(struct strbuf *sb,
-               struct reflog_walk_info *reflog_info,
-               const struct date_mode *dmode, int force_date,
-               int shorten);
+void init_reflog_walk(struct reflog_walk_info **info);
+int add_reflog_for_walk(struct reflog_walk_info *info,
+                       struct commit *commit, const char *name);
+void show_reflog_message(struct reflog_walk_info *info, int,
+                        const struct date_mode *, int force_date);
+void get_reflog_message(struct strbuf *sb,
+                       struct reflog_walk_info *reflog_info);
+const char *get_reflog_ident(struct reflog_walk_info *reflog_info);
+timestamp_t get_reflog_timestamp(struct reflog_walk_info *reflog_info);
+void get_reflog_selector(struct strbuf *sb,
+                        struct reflog_walk_info *reflog_info,
+                        const struct date_mode *dmode, int force_date,
+                        int shorten);
 
-extern int reflog_walk_empty(struct reflog_walk_info *walk);
+int reflog_walk_empty(struct reflog_walk_info *walk);
 
 struct commit *next_reflog_entry(struct reflog_walk_info *reflog_info);