Re: The merge from hell...

From: Linus Torvalds <torvalds@osdl.org>
Date: Feb 4, 2006, 02:47 UTC
Message-ID: <Pine.LNX.4.64.0602031841320.3969@g5.osdl.org>
In-Reply-To: <7vy80r97h6.fsf@assigned-by-dhcp.cox.net>

On Fri, 3 Feb 2006, Junio C Hamano wrote:

Show 9 quoted lines

> 
> 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