From 906386598769a54c5ff20bc5702882f422f7b61d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 3 May 2016 14:42:32 -0700 Subject: [PATCH] Updated OpenZFS Patches (markdown) --- OpenZFS-Patches.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenZFS-Patches.md b/OpenZFS-Patches.md index 3791577..7948672 100644 --- a/OpenZFS-Patches.md +++ b/OpenZFS-Patches.md @@ -58,7 +58,7 @@ $ git format-patch --stdout c423721^..c423721 | ./scripts/zfs2zol-patch.sed >ope $ git am ./openzfs-5669.diff ``` -**Update the commit message.** By using `git format-patch` to generate the patch and then `git am` to apply it the original comment and authorship will be preserved. The commit should then be amended to match the standard form used for all changes applied from OpenZFS: This following information should be included: +**Update the commit message.** By using `git format-patch` to generate the patch and then `git am` to apply it the original comment and authorship will be preserved. The commit should then be amended to match the standard form used for all changes applied from OpenZFS: The following information should be included: * A short subject line of the form: "OpenZFS issue - short description". * The original patch authorship should be preserved. @@ -67,9 +67,9 @@ $ git am ./openzfs-5669.diff * **Reviewed by:** All OpenZFS reviewers from the original patch. * **Approved by:** All OpenZFS reviewers from the original patch. * **Ported-by:** Your name and email address. - * **OpenZFS-issue:** https://www.illumos.org/issues/ - * **OpenZFS-commit:** https://github.com/openzfs/openzfs/commit/ - * Optionally a **Porting Notes:** section describing any changes required when porting. + * **OpenZFS-issue:** https ://www.illumos.org/issues/issue + * **OpenZFS-commit:** https ://github.com/openzfs/openzfs/commit/hash + * **Porting Notes:** An optional section describing any changes required when porting. For example: