From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Aug 2011 23:00:53 +0000 (-0700)
Subject: Merge branch 'jc/merge-reword'
X-Git-Tag: v1.7.7-rc0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/284daf29026c519729747bd2051829f0f958473c?hp=-c

Merge branch 'jc/merge-reword'

* jc/merge-reword:
merge: reword the final message
---

284daf29026c519729747bd2051829f0f958473c
diff --combined builtin/merge.c
index 325891edb6,8bc453d2f3..f32c5c6432
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@@ -339,14 -339,13 +339,14 @@@ static void squash_message(void
  
  	ctx.abbrev = rev.abbrev;
  	ctx.date_mode = rev.date_mode;
 +	ctx.fmt = rev.commit_format;
  
  	strbuf_addstr(&out, "Squashed commit of the following:\n");
  	while ((commit = get_revision(&rev)) != NULL) {
  		strbuf_addch(&out, '\n');
  		strbuf_addf(&out, "commit %s\n",
  			sha1_to_hex(commit->object.sha1));
 -		pretty_print_commit(rev.commit_format, commit, &out, &ctx);
 +		pretty_print_commit(&ctx, commit, &out);
  	}
  	if (write(fd, out.buf, out.len) < 0)
  		die_errno(_("Writing SQUASH_MSG"));
@@@ -903,7 -902,7 +903,7 @@@ static int finish_automerge(struct comm
  	strbuf_addch(&merge_msg, '\n');
  	run_prepare_commit_msg();
  	commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
- 	strbuf_addf(&buf, "Merge made by %s.", wt_strategy);
+ 	strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
  	finish(result_commit, buf.buf);
  	strbuf_release(&buf);
  	drop_save();