Re: Merge commit subjects git.git

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jay Soffian wrote:
> Color me curious, but why do the merge commit message in git.git
> sometimes look like this:
> 
>   Merge branch 'jn/paginate-fix'
> 
> And other times like this:
> 
>   Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix
> 
> I don't really see any rhyme or reason about when the "into ..." is
> there and when it's not.

A merge that does not have the 'into <branch>' bit is a merge to
master:

static void do_fmt_merge_msg_title(struct strbuf *out,
	const char *current_branch) {
[...]
	if (!strcmp("master", current_branch))
		strbuf_addch(out, '\n');
	else
		strbuf_addf(out, " into %s\n", current_branch);
}


-- 
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]