X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=patchformatting.mdwn;h=ed15b9f83bf1457ca0cbaf96bb81832061c370a4;hb=882d2cdc07b55af79c5354fb2562daee22a62b81;hp=dac2c2d726548875af7a46bd0c94804419c17130;hpb=2e9ffeb0066ca22b315bacbd706a8ea2b1f9fd66;p=obsolete%2Fnotmuch-wiki diff --git a/patchformatting.mdwn b/patchformatting.mdwn index dac2c2d..ed15b9f 100644 --- a/patchformatting.mdwn +++ b/patchformatting.mdwn @@ -12,6 +12,8 @@ you should check the following: 3. Get familiar with coding conventions used. +4. Read `devel/STYLE` in notmuch source. + This way you get some insight of the look and feel of the patches sent, both the way code should be written, how to write commit log messages and how to participate patch discussions. @@ -94,7 +96,7 @@ This is the file name of your patch with content: From <-40-character-sha1-hexadecimal-string-> Day Mon DD HH:MM:SS YYYY From: user.name Date: Day, DD Mon YYYY HH:MM:SS TZOFF - Subject: [PATCH] first commit line; one line description, up to 65 chars + Subject: [PATCH] first commit line; one line description, up to 72 chars after one empty line, a detailed description of your patch the description most usually spans over multiple lines. @@ -139,7 +141,7 @@ test-apply your patch files on origin/master: git reset --hard origin/master git pull git am 00* - + : git reset --hard `cat head_commit` git stash apply rm head_commit