X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=patchformatting.mdwn;h=5fe1c1a2d07d41d375134ca4cb88f24621c4f6d1;hb=c16051b9c2fc179a9bc2c6a8d096aa549d443095;hp=dda840feb96e5cfdc939a95d71cef27a9a533645;hpb=f5ddc01eb0181124a8449a12afe2587e2304e6fb;p=obsolete%2Fnotmuch-wiki diff --git a/patchformatting.mdwn b/patchformatting.mdwn index dda840f..5fe1c1a 100644 --- a/patchformatting.mdwn +++ b/patchformatting.mdwn @@ -94,7 +94,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 +139,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