bash: add '--merges' to common 'git log' options

diff --git a/log-tree.h b/log-tree.h
index 59ba4c48b7966db34c6345a445ab0b10e235ac83..20b5caf1aa45aa0ba076ec60320d252c42abfb64 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -12,10 +12,15 @@ int log_tree_diff_flush(struct rev_info *);
 int log_tree_commit(struct rev_info *, struct commit *);
 int log_tree_opt_parse(struct rev_info *, const char **, int);
 void show_log(struct rev_info *opt);
-void show_decorations(struct commit *commit);
-void log_write_email_headers(struct rev_info *opt, const char *name,
+void show_decorations(struct rev_info *opt, struct commit *commit);
+void log_write_email_headers(struct rev_info *opt, struct commit *commit,
                             const char **subject_p,
                             const char **extra_headers_p,
                             int *need_8bit_cte_p);
+void load_ref_decorations(void);
+
+#define FORMAT_PATCH_NAME_MAX 64
+void get_patch_filename(struct commit *commit, int nr, const char *suffix,
+                       struct strbuf *buf);
 
 #endif