diff --git a/_config.yml b/_config.yml index 5012a85..04d5bd9 100644 --- a/_config.yml +++ b/_config.yml @@ -5,7 +5,7 @@ description: > author: Jim Myhrberg versions: - - 1.0.0-draft.9 + - 1.0.0-draft.10 gems: - jekyll-sitemap diff --git a/index.md b/index.md index 5ebb86b..e65768e 100644 --- a/index.md +++ b/index.md @@ -1,9 +1,9 @@ --- -title: Git Common-Flow 1.0.0-draft.9 -version: 1.0.0-draft.9 +title: Git Common-Flow 1.0.0-draft.10 +version: 1.0.0-draft.10 --- -Git Common-Flow 1.0.0-draft.9 -============================= +Git Common-Flow 1.0.0-draft.10 +============================== Summary ------- @@ -87,13 +87,15 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). discuss the changes with others there. 3. Git Best Practices 1. All commit messages SHOULD follow the Commit Guidelines and format from - the official git documentation: + the official git + documentation: 2. You SHOULD always use "--force-with-lease" when doing a force push. The - plain "--force" option is dangerous and destructive. More information: + plain "--force" option is dangerous and destructive. More + information: - 3. You SHOULD understand and be comfortable with rebasing: - + 3. You SHOULD understand and be comfortable with + rebasing: 4. It is RECOMMENDED that you always do "git pull --rebase" instead of "git pull" to avoid unnecessary merge commits. You can make this the default behavior of "git pull" with "git config --global pull.rebase true". @@ -108,9 +110,9 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). 2. If you are using a "VERSION" file in the root of the project, this MUST only contain the exact version string. 3. The version string SHOULD follow the Semantic Versioning - () format. Use of Semantic Versioning is OPTIONAL, but - the version string MUST NOT have a "v" prefix. For example "v2.11.4" is - bad, and "2.11.4" is good. + () format. Use of Semantic Versioning is OPTIONAL, + but the version string MUST NOT have a "v" prefix. For example "v2.11.4" + is bad, and "2.11.4" is good. 5. Releases 1. To create a new release, you MUST create a "version bump" commit directly on the master branch which changes the hard-coded version value of the diff --git a/spec/1.0.0-draft.9.md b/spec/1.0.0-draft.10.md similarity index 95% rename from spec/1.0.0-draft.9.md rename to spec/1.0.0-draft.10.md index 5ebb86b..e65768e 100644 --- a/spec/1.0.0-draft.9.md +++ b/spec/1.0.0-draft.10.md @@ -1,9 +1,9 @@ --- -title: Git Common-Flow 1.0.0-draft.9 -version: 1.0.0-draft.9 +title: Git Common-Flow 1.0.0-draft.10 +version: 1.0.0-draft.10 --- -Git Common-Flow 1.0.0-draft.9 -============================= +Git Common-Flow 1.0.0-draft.10 +============================== Summary ------- @@ -87,13 +87,15 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). discuss the changes with others there. 3. Git Best Practices 1. All commit messages SHOULD follow the Commit Guidelines and format from - the official git documentation: + the official git + documentation: 2. You SHOULD always use "--force-with-lease" when doing a force push. The - plain "--force" option is dangerous and destructive. More information: + plain "--force" option is dangerous and destructive. More + information: - 3. You SHOULD understand and be comfortable with rebasing: - + 3. You SHOULD understand and be comfortable with + rebasing: 4. It is RECOMMENDED that you always do "git pull --rebase" instead of "git pull" to avoid unnecessary merge commits. You can make this the default behavior of "git pull" with "git config --global pull.rebase true". @@ -108,9 +110,9 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). 2. If you are using a "VERSION" file in the root of the project, this MUST only contain the exact version string. 3. The version string SHOULD follow the Semantic Versioning - () format. Use of Semantic Versioning is OPTIONAL, but - the version string MUST NOT have a "v" prefix. For example "v2.11.4" is - bad, and "2.11.4" is good. + () format. Use of Semantic Versioning is OPTIONAL, + but the version string MUST NOT have a "v" prefix. For example "v2.11.4" + is bad, and "2.11.4" is good. 5. Releases 1. To create a new release, you MUST create a "version bump" commit directly on the master branch which changes the hard-coded version value of the