jimeh/common-flow
1
0
Fork 0
mirror of https://github.com/jimeh/common-flow.git synced 2026-02-19 09:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
81 Commits 1 Branch 16 Tags
6a56ee1c4041f08f0e55b21b49ada64b4fa76436
Commit Graph

81 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Myhrberg
6a56ee1c40 Merge pull request #13 from jimeh/allow-rebase-or-merge-update 
Allow updating change branches via rebase or merge
 2017-08-29 01:54:33 +01:00
Jim Myhrberg
610d131dd5 Minor rewording 2017-08-27 00:15:39 +01:00
Jim Myhrberg
0b2cde114a Enforce change branch update via rebase, allow merge if really needed 2017-08-27 00:15:39 +01:00
Jim Myhrberg
4fd8d2f639 Allow updating change branches via rebase or merge 
Allow for pulling in changes from the source branch either via
rabasing or merging, instead of only allowing rebasing. Rebasing is
still recommended however.
 2017-08-27 00:15:39 +01:00
Jim Myhrberg
5cecf7dd84 Update terminology section to reflect recent changes to spec 2017-08-27 00:14:25 +01:00
Jim Myhrberg
045eded571 Swap order of "git add -i" and "git add -p" 
Using the -p option is a shorthand to get into the patch section of
interactive mode. Hence the -i option is the main one to use.
 2017-08-26 20:45:39 +01:00
Jim Myhrberg
399c5bf27a Recommend to not use a "v" prefix in release tags 2017-08-26 20:43:16 +01:00
Jim Myhrberg
eb1048f3c0 Fix grammar mistakes 2017-08-26 20:42:29 +01:00
Jim Myhrberg
264e5c3ee9 Be a bit less strict about separate branches for each change 
Basically, there might very well be valid reasons to roll one change
into another if one is dependant on the other, even if they're
technically distinctly different changes. Ideally this shouldn't
happen, but let's at least allow it if really needed.
 2017-08-25 13:11:33 +01:00
Jim Myhrberg
31ee540bd9 Break apart first Change Branch requirement into four separate ones 2017-08-25 13:08:49 +01:00
Jim Myhrberg
efe86ce5ba Merge pull request #14 from jimeh/encourage-clean-git-history 
Encourage a clean commit history within pull requests
 2017-08-14 11:21:01 +01:00
Jim Myhrberg
7b90cfd10d Encourage a clean commit history within pull requests 
And also make it more obvious what pull requests are intended for.

Should address #11.
 2017-08-08 21:42:56 +01:00
Jim Myhrberg
62f817a5ea Update release branch sections 
- Fixes #9
- Restructures "Release Branches" section with it's sub-sections into
  two separate top-level sections for short-term and long-term release
  branches.
 2017-08-08 20:50:55 +01:00
Jim Myhrberg
7858131cf5 Merge pull request #12 from jimeh/optional-hard-coded-version 
Make hard-coded version string and version bump commits optional
 2017-08-04 12:15:14 +01:00
Jim Myhrberg
72335f9049 Make hard-coded version string and version bump commits optional 2017-07-30 02:48:45 +01:00
Jim Myhrberg
587e5e5a86 Merge pull request #10 from connec/patch-1 
Fix capitalisation of RFC 2119 key word
 2017-07-25 11:22:35 +01:00
Chris Connelly
5179942226 Fix capitalisation of RFC 2119 key word 2017-07-25 11:19:23 +01:00
Jim Myhrberg
ce93a540fe Merge pull request #7 from Pavling/feature/extend-git-add-options 
Recommending `git add --patch`
 2017-07-25 10:38:30 +01:00
Michael Pavling
4b4fa6d8b9 adding to the recommendation of doing an interactive 'git add' to show the shortcut to patching 2017-07-25 09:07:51 +01:00
Jim Myhrberg
fd8411c652 Bump version to 1.0.0-rc.3 1.0.0-rc.3 2017-07-12 14:39:21 +01:00
Jim Myhrberg
34e846590c Link directly to Commit Guidelines section 2017-07-12 14:38:50 +01:00
Jim Myhrberg
e71ed502ca Reword summary slightly 2017-07-12 14:38:40 +01:00
Jim Myhrberg
5c813abe56 Merge pull request #4 from jimeh/remove-bleeding-edge-terminology 
Remove "bleeding edge" terminology
 2017-07-11 13:30:54 +01:00
Jim Myhrberg
40bfd924d4 Pre-release releases are not safe for production use 2017-07-10 21:13:01 +01:00
Jim Myhrberg
7ed4cdf687 Remove "bleeding edge" terminology 
The term "bleeding edge", and it's less scary sibling "leading edge"
both mean slightly different things to different people. Hence we're
removing it in favor of attempting to fully explain how the master
branch should be considered.
 2017-07-10 21:00:45 +01:00
Jim Myhrberg
a65d82f791 Update TL;DR summary 2017-07-09 21:47:59 +01:00
Jim Myhrberg
bdc4e35391 Bump version to 1.0.0-rc.2 1.0.0-rc.2 2017-07-09 20:26:13 +01:00
Jim Myhrberg
32cc2b944c Move hard-coded version string into a VERSION file 2017-07-09 20:11:50 +01:00
Jim Myhrberg
e67812ca11 Minor fixes 2017-07-09 20:09:53 +01:00
Jim Myhrberg
5c783bc234 Add best practice about not using "git commit -a" 2017-07-07 16:32:59 +01:00
Jim Myhrberg
90a6abc1c3 Don't allow mixing "v" prefix and non-prefix tags 2017-07-07 16:32:27 +01:00
Jim Myhrberg
1362060294 Break pull request information into it's own section 2017-07-07 16:31:40 +01:00
Jim Myhrberg
4b1dac4d2d Restructure release branch sections 2017-07-06 00:46:19 +01:00
Jim Myhrberg
ba6fac3692 Initial reworking of maintenance branches into release branches 2017-07-06 00:33:53 +01:00
Jim Myhrberg
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
Jim Myhrberg
0b429bf254 Bump version to 1.0.0-rc.1 1.0.0-rc.1 2017-07-03 21:28:40 +01:00
Jim Myhrberg
05f9c5d9a4 Add basic diagram 2017-07-03 19:40:33 +01:00
Jim Myhrberg
6449a8f3c1 Bump version to 1.0.0-draft.10 1.0.0-draft.10 2017-07-03 15:42:00 +01:00
Jim Myhrberg
3f31908876 Update links to be compatible with GitHub Pages 2017-07-03 15:39:54 +01:00
Jim Myhrberg
727f207b26 Bump version to 1.0.0-draft.9 1.0.0-draft.9 2017-07-03 14:50:04 +01:00
Jim Myhrberg
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
Jim Myhrberg
c643f1472c Bump version to 1.0.0-draft.8 1.0.0-draft.8 2017-07-03 11:17:39 +01:00
Jim Myhrberg
a97af1fe6a Expand "Commit Message" section to "Git Best Practices" 2017-07-03 11:16:49 +01:00
Jim Myhrberg
2a3582ef53 Add requirement of pushing change branch after rebashing 2017-07-03 11:16:23 +01:00
Jim Myhrberg
9c1cbfb767 Clean up summary wording slightly 2017-07-03 11:14:35 +01:00
Jim Myhrberg
52b30ccd6c Bump version to 1.0.0-draft.7 1.0.0-draft.7 2017-07-02 22:10:55 +01:00
Jim Myhrberg
97dc8e202a Remove two requirements which are a bit out of scope 2017-07-02 22:10:03 +01:00
Jim Myhrberg
0b9eb0e749 Fix a typo 2017-07-02 22:09:51 +01:00