From: Linus Torvalds Date: Sun, 27 Nov 2011 20:12:13 +0000 (-0800) Subject: Merge git://github.com/JoachimSchipper/subsurface X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=addfe79024abf29740b3d6b6b88d27469289c2e2;hp=ee68ada729837162e29d879ca408836d0d66c7ac;p=ext%2Fsubsurface.git Merge git://github.com/JoachimSchipper/subsurface * git://github.com/JoachimSchipper/subsurface: README spelling, capitalization --- diff --git a/README b/README index d2a75c4..d7ed22a 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ Half-arsed divelog software in C. -I'm tired of java programs that don't work etc. +I'm tired of Java programs that don't work etc. License: GPLv2 @@ -161,13 +161,13 @@ See: http://gerrit.googlecode.com/svn/documentation/2.0/user-signedoffby.html Also, please write good git commit messages. A good commit message looks like this: - header line: explaining the commit in one line + Header line: explaining the commit in one line Body of commit message is a few lines of text, explaining things in more detail, possibly giving some background about the issue being fixed, etc etc. - The body of the commit message can be several paragrahps, and + The body of the commit message can be several paragraphs, and please do proper word-wrap and keep columns shorter than about 74 characters or so. That way "git log" will show things nicely even when it's indented.