On 5/9/06, Junio C Hamano <junkio@cox.net> wrote: > "Bertrand Jacquin" <beber.mailing@gmail.com> writes: > > > Is there a way to track merge like that? > > The command line you quoted shows the relevant information for > people who want to know what happened in that merge. > > Namely: > > * it always shows the header and the message > > * it shows the changes that are not trivial (i.e. merge parents > have overlapping different versions and manual resolution > resulted in something different from either parents). > > It is not a replacement for format-patch, but I think the commit > mailing list is not for machines to receive and apply the > received patches, but for humans to inspect, so it would be more > suitable than a naive alternative of showing diff from all > parents concatenated together. That's right. And don't want to do that. But I would like to send an email after merge to inform people that: o tree ``a'' and ``b'' have been merged. o made by John Doe at a time o show a diffstat. o show a --short-log=oneline from merge base. -- Beber #e.fr@freenode - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Tue May 09 11:10:13 2006
This archive was generated by hypermail 2.1.8 : 2006-05-09 11:10:41 EST