From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jun 2010 18:16:54 +0000 (-0700)
Subject: Merge branch 'tc/merge-m-log'
X-Git-Tag: v1.7.2-rc0~60
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8642abc76454a6e09344e27a7797ff08264abe76;p=git.git

Merge branch 'tc/merge-m-log'

* tc/merge-m-log:
  merge: --log appends shortlog to message if specified
  fmt-merge-msg: add function to append shortlog only
  fmt-merge-msg: refactor merge title formatting
  fmt-merge-msg: minor refactor of fmt_merge_msg()
  merge: rename variable
  merge: update comment
  t7604-merge-custom-message: show that --log doesn't append to -m
  t7604-merge-custom-message: shift expected output creation

Conflicts:
	builtin.h
---

8642abc76454a6e09344e27a7797ff08264abe76
diff --cc builtin.h
index 5c887ef61,322901f33..b614d12b9
--- a/builtin.h
+++ b/builtin.h
@@@ -16,6 -16,10 +16,7 @@@ extern const char *help_unknown_cmd(con
  extern void prune_packed_objects(int);
  extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
  	struct strbuf *out);
+ extern int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out);
 -extern int commit_tree(const char *msg, unsigned char *tree,
 -		struct commit_list *parents, unsigned char *ret,
 -		const char *author);
  extern int commit_notes(struct notes_tree *t, const char *msg);
  
  struct notes_rewrite_cfg {