From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: "Brown, Len" <len.brown@intel.com>,
Git Mailing List <git@vger.kernel.org>,
Paul Mackerras <paulus@samba.org>,
Marco Costalba <mcostalba@yahoo.it>,
Aneesh Kumar <aneesh.kumar@gmail.com>,
Dave Jones <davej@redhat.com>
Subject: Re: The merge from hell...
Date: Fri, 3 Feb 2006 18:47:08 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0602031841320.3969@g5.osdl.org> (raw)
In-Reply-To: <7vy80r97h6.fsf@assigned-by-dhcp.cox.net>
On Fri, 3 Feb 2006, Junio C Hamano wrote:
>
> It might make sense if we have a tool support to pre-format the
> merge messages like this, given set of branch names:
>
> [ACPI] Merge 3549, 4320, 4485, 4588, 4980, 5483, 5651, acpica, asus, fops and pnpacpi branches into release
>
> 3549: [ACPI] Disable C2/C3 for _all_ IBM R40e Laptops
> 4320: [ACPI] fix reboot upon suspend-to-disk
> 4485: [ACPI] handle BIOS with implicit C1 in _CST
..
Well, this is actually not all that different from what gitk will show you
(since I added the commit "explanation" names with my increadible
copy-paste skills to it).
Just look in the details window in gitk on that merge, and that's pretty
much exactly what you'll see, except you'll also have the nice clickable
hyperlink features ;)
Yeah, it doesn't show the branch names _and_ it shows the commit that you
merged into too, so it looks like
Parent: 3ee68.. ([SPARC64]: Use compat_sys_futimesat in 32-bit syscall table.)
Parent: 876c1.. ([ACPI] Disable C2/C3 for _all_ IBM R40e Laptops)
Parent: 729b4.. ([ACPI] fix reboot upon suspend-to-disk)
Parent: cf824.. ([ACPI] handle BIOS with implicit C1 in _CST)
but it's actually pretty readable there.
Linus
next prev parent reply other threads:[~2006-02-04 2:47 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-03 18:34 The merge from hell Brown, Len
2006-02-04 2:35 ` Junio C Hamano
2006-02-04 2:47 ` Linus Torvalds [this message]
2006-02-04 7:17 ` [PATCH] fmt-merge-msg: show summary of what is merged Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2006-02-03 6:41 The merge from hell linux
2006-02-03 6:04 Brown, Len
2006-02-03 6:16 ` Linus Torvalds
2006-02-03 6:33 ` Junio C Hamano
2006-02-03 4:20 Brown, Len
2006-02-03 5:45 ` Linus Torvalds
2006-02-03 6:28 ` Junio C Hamano
2006-02-03 16:21 ` Dave Jones
2006-02-02 6:28 Linus Torvalds
2006-02-02 7:05 ` Junio C Hamano
2006-02-02 7:51 ` Linus Torvalds
2006-02-02 7:55 ` Linus Torvalds
2006-02-02 8:08 ` Linus Torvalds
2006-02-04 10:46 ` Paul Mackerras
2006-02-04 12:22 ` Junio C Hamano
2006-02-04 19:42 ` Linus Torvalds
2006-02-04 20:59 ` Linus Torvalds
2006-02-02 7:25 ` Marco Costalba
2006-02-02 8:02 ` Linus Torvalds
2006-02-02 8:07 ` Aneesh Kumar
2006-02-02 8:27 ` Junio C Hamano
2006-02-02 8:44 ` Linus Torvalds
2006-02-02 10:41 ` Junio C Hamano
2006-02-05 19:42 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0602031841320.3969@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=aneesh.kumar@gmail.com \
--cc=davej@redhat.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=len.brown@intel.com \
--cc=mcostalba@yahoo.it \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).