Commit Graph

42 Commits

Author SHA1 Message Date
727f207b26 Bump version to 1.0.0-draft.9 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 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 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 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 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 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 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 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 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
41aa318a4a Change formatting of branch types list 2017-06-30 23:19:09 +01:00
7a028c4c0b Update wording of change branches 2017-06-30 23:13:47 +01:00
cfe59088ab Update structure of Summary 2017-06-30 23:11:01 +01:00
f419f050aa Update title capitalization 2017-06-30 23:01:53 +01:00
7020acb7bc Initial commit 2017-06-30 22:56:19 +01:00