linux-kernel - Re: [GIT] Networking

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130709.213555.1037822981842851807.davem@davemloft.net>
Date:	Tue, 09 Jul 2013 21:35:55 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	torvalds@...ux-foundation.org
Cc:	akpm@...ux-foundation.org, netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: [GIT] Networking

From: Linus Torvalds <torvalds@...ux-foundation.org>
Date: Tue, 9 Jul 2013 19:50:41 -0700

> Now, I'm all for making descriptive merge commit messages, including
> improving on the summary line. So by all means write those nice merge
> messages with explanations. I think something like
> 
>     dc3d807d6fd9 Merge "openvswitch: gre tunneling support."
> 
> would have been a *fine* summary line, for example, and quite possibly
> better than the default kind of git merge summary lines (ie "Merge
> branch 'openswitch'"). So I'm not against playing with merge messages
> per se, it's literally this "cannot tell it's a merge any more in the
> summary" that I thing is a problem.

Ok, I'll use that format in the future.  I was actually trying to add
more information, not less. :-) But yeah that header line has to
mention that it's a merge, for sure.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/