summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-08-28 15:41:49 -0400
committerKali Kaneko <kali@leap.se>2015-08-28 15:41:49 -0400
commit19d96f97d752ef481eec5f44b88aee0a6bbb8dcb (patch)
tree29ff012d268389043b10fb806a4384c67d92c982 /docs
parentda1a936af43962f4531eda51fa5834391f6745a1 (diff)
parent20966f78951d734f100ed6a6a6feedd15dbe79e7 (diff)
Merge tag '0.7.2' into debian/experimental
Tag leap.soledad version 0.7.2
Diffstat (limited to 'docs')
-rw-r--r--docs/debian-repackaging.rst2
-rw-r--r--docs/leap-commit-template7
-rw-r--r--docs/leap-commit-template.README47
3 files changed, 55 insertions, 1 deletions
diff --git a/docs/debian-repackaging.rst b/docs/debian-repackaging.rst
index a7488a84..888d6c03 100644
--- a/docs/debian-repackaging.rst
+++ b/docs/debian-repackaging.rst
@@ -6,7 +6,7 @@ How to repackage latest code
Enter debian branch::
- git checkout debian
+ git checkout debian/experimental
Merge your latest and greatest::
diff --git a/docs/leap-commit-template b/docs/leap-commit-template
new file mode 100644
index 00000000..8a5c7cd0
--- /dev/null
+++ b/docs/leap-commit-template
@@ -0,0 +1,7 @@
+[bug|feat|docs|style|refactor|test|pkg|i18n] ...
+...
+
+- Resolves: #XYZ
+- Related: #XYZ
+- Documentation: #XYZ
+- Releases: XYZ
diff --git a/docs/leap-commit-template.README b/docs/leap-commit-template.README
new file mode 100644
index 00000000..ce8809e7
--- /dev/null
+++ b/docs/leap-commit-template.README
@@ -0,0 +1,47 @@
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+HOW TO USE THIS TEMPLATE:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Run `git config commit.template docs/leap-commit-template` or
+edit the .git/config for this project and add
+`template = docs/leap-commit-template`
+under the [commit] block
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+COMMIT TEMPLATE FORMAT EXPLAINED
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+[type] <subject>
+
+<body>
+<footer>
+
+Type should be one of the following:
+- bug (bug fix)
+- feat (new feature)
+- docs (changes to documentation)
+- style (formatting, pep8 violations, etc; no code change)
+- refactor (refactoring production code)
+- test (adding missing tests, refactoring tests; no production code change)
+- pkg (packaging related changes; no production code change)
+- i18n translation related changes
+
+Subject should use imperative tone and say what you did.
+For example, use 'change', NOT 'changed' or 'changes'.
+
+The body should go into detail about changes made.
+
+The footer should contain any issue references or actions.
+You can use one or several of the following:
+
+- Resolves: #XYZ
+- Related: #XYZ
+- Documentation: #XYZ
+- Releases: XYZ
+
+The Documentation field should be included in every new feature commit, and it
+should link to an issue in the bug tracker where the new feature is analyzed
+and documented.
+
+For a full example of how to write a good commit message, check out
+https://github.com/sparkbox/how_to/tree/master/style/git