bdc4e35391
Bump version to 1.0.0-rc.2
2017-07-09 20:26:13 +01:00
32cc2b944c
Move hard-coded version string into a VERSION file
2017-07-09 20:11:50 +01:00
e67812ca11
Minor fixes
2017-07-09 20:09:53 +01:00
5c783bc234
Add best practice about not using "git commit -a"
2017-07-07 16:32:59 +01:00
90a6abc1c3
Don't allow mixing "v" prefix and non-prefix tags
2017-07-07 16:32:27 +01:00
1362060294
Break pull request information into it's own section
2017-07-07 16:31:40 +01:00
4b1dac4d2d
Restructure release branch sections
2017-07-06 00:46:19 +01:00
ba6fac3692
Initial reworking of maintenance branches into release branches
2017-07-06 00:33:53 +01:00
1640809047
Update diagram
...
- Change tags from 2.11.4/2.12.0 to 2.11.0/2.12.0.
- Move grey dotted lines to the back so they're not overlaying the
black outlines.
2017-07-04 09:14:39 +01:00
0b429bf254
Bump version to 1.0.0-rc.1
2017-07-03 21:28:40 +01:00
05f9c5d9a4
Add basic diagram
2017-07-03 19:40:33 +01:00
6449a8f3c1
Bump version to 1.0.0-draft.10
2017-07-03 15:42:00 +01:00
3f31908876
Update links to be compatible with GitHub Pages
2017-07-03 15:39:54 +01:00
727f207b26
Bump version to 1.0.0-draft.9
2017-07-03 14:50:04 +01:00
d0c03c8692
Merge pull request #1 from alexmreis/add-merge-recommendation
...
Include git merge --no-ff in best practices
2017-07-03 14:40:37 +01:00
Alexandre M. Reis
abc2d4350f
Update common-flow.md
2017-07-03 15:36:09 +02:00
Alexandre M. Reis
82e481ebd9
Include git merge --no-ff in best practices
2017-07-03 15:28:29 +02:00
c643f1472c
Bump version to 1.0.0-draft.8
2017-07-03 11:17:39 +01:00
a97af1fe6a
Expand "Commit Message" section to "Git Best Practices"
2017-07-03 11:16:49 +01:00
2a3582ef53
Add requirement of pushing change branch after rebashing
2017-07-03 11:16:23 +01:00
9c1cbfb767
Clean up summary wording slightly
2017-07-03 11:14:35 +01:00
52b30ccd6c
Bump version to 1.0.0-draft.7
2017-07-02 22:10:55 +01:00
97dc8e202a
Remove two requirements which are a bit out of scope
2017-07-02 22:10:03 +01:00
0b9eb0e749
Fix a typo
2017-07-02 22:09:51 +01:00
d6ad820314
Use less forful language around committing often locally
2017-07-02 22:09:13 +01:00
232712591f
Bump version to 1.0.0-draft.6
2017-07-02 19:12:47 +01:00
a6318ab0bc
Update and fix wording in terminology section
2017-07-02 19:12:21 +01:00
916e130551
Bump version to 1.0.0-draft.5
2017-07-02 19:07:47 +01:00
96bd8e3a92
Update terminology, and turn it into it's own section
2017-07-02 19:07:19 +01:00
684551895a
Bump version to 1.0.0-draft.4
2017-07-02 18:57:37 +01:00
0edb580207
Specify change branch must be up to date before PR is merged
2017-07-02 18:57:12 +01:00
9472906a60
Minor rewording
2017-07-02 18:56:52 +01:00
51b43c6c8f
Bump version to 1.0.0-draft.3
2017-07-02 18:40:25 +01:00
6016742c2d
Lots of changes for draft 3
...
- Master branch is no longer required to always be release/production
ready, only releases are truely stable, but it's highly recommended
to try and keep the master branch as near to release/production
ready as possible.
- Various mentions of test suites should pass before doing X.
- Restructured requirements into distinct sections making it easier to
read and reason about.
2017-07-02 18:36:09 +01:00
71e5a7aae8
Bump version to 1.0.0-draft.2
2017-07-01 21:27:41 +01:00
8d2d8428e9
Fix inconsistency between summary and specification
2017-07-01 21:26:45 +01:00
a3636c3d4b
Bump version to 1.0.0-draft.1
2017-07-01 21:14:33 +01:00
ca50e41360
Add remainder of requirements, author and license info
2017-07-01 21:13:22 +01:00
c527022181
Update and add requirements
2017-07-01 17:38:47 +01:00
e6df1f9eed
Update wording in requirements
2017-07-01 17:28:02 +01:00
38671d77b4
Reset specification version to 1.0.0-draft.0
...
As 1.0.0-draft.1 is still in progress, the current version is really
1.0.0-draft.0.
2017-07-01 17:18:17 +01:00
1b76caef83
Update specification requirements
2017-07-01 17:17:55 +01:00
c4a366d65d
Update summary
2017-07-01 16:46:16 +01:00
955328a5f2
Updated specification
2017-07-01 14:46:41 +01:00
a004e4e3a9
Updated summary rules
2017-07-01 14:46:23 +01:00
bf49e2cdb9
Add first two clauses to specification
2017-07-01 14:35:06 +01:00
98b483edb6
Add specification section header and RFC 2119 note
2017-07-01 00:52:05 +01:00
aa3fda6813
Move Branch Types up above Rules in Summary section
2017-07-01 00:48:50 +01:00
26bfe140ab
Update summary
2017-07-01 00:42:20 +01:00
6b9ea8a9c6
Update summary wording
2017-07-01 00:40:59 +01:00
