common-flow

jimeh/common-flow

Fork 0

mirror of https://github.com/jimeh/common-flow.git synced 2026-02-19 01:16:40 +00:00

Commit Graph

Select branches

Hide Pull Requests

main

#1

#10

#12

#13

#14

#16

#22

#22

#26

#27

#28

#29

#30

#31

#4

#5

#7

1.0.0-draft.1

1.0.0-draft.10

1.0.0-draft.2

1.0.0-draft.3

1.0.0-draft.4

1.0.0-draft.5

1.0.0-draft.6

1.0.0-draft.7

1.0.0-draft.8

1.0.0-draft.9

1.0.0-rc.1

1.0.0-rc.2

1.0.0-rc.3

1.0.0-rc.4

1.0.0-rc.5

2.0.0

ac14141228 chore(release): 2.0.0 main 2.0.0 Jim Myhrberg 2026-01-13 09:55:05 +00:00
85675526bc Merge pull request #31 from jimeh/rework-common-flow-v2 Jim Myhrberg 2026-01-13 09:50:28 +00:00
f763dabb0b fix(spec): improve RFC 2119 keyword consistency Jim Myhrberg 2026-01-12 09:09:37 +00:00
e38a08b265 feat(releases): allow release tags on merge commits for PR-based releases Jim Myhrberg 2026-01-12 08:58:01 +00:00
27fafc85e4 refactor(spec): reorder specification sections for better flow Jim Myhrberg 2026-01-12 08:46:02 +00:00
89094a20a0 feat(faq): add guidance for handling monorepos Jim Myhrberg 2026-01-12 08:34:38 +00:00
798ef4fced chore(format): convert markdown headings to atx-style Jim Myhrberg 2026-01-12 08:18:10 +00:00
b0a7633162 feat: initial set of rework to prepare a v2 of Common-Flow Jim Myhrberg 2026-01-12 08:04:59 +00:00
f4af7ce21d Merge pull request #30 from jimeh/update-link-urls Jim Myhrberg 2026-01-10 18:39:57 +00:00
c471aa9b37 fix(links): update link URLs Jim Myhrberg 2026-01-10 18:23:59 +00:00
f1eae76bd0 Merge pull request #29 from jimeh/wording-formatting-improvements Jim Myhrberg 2026-01-10 07:30:02 +00:00
c1aceee08a chore: minor wording and formatting improvements Jim Myhrberg 2026-01-10 07:29:24 +00:00
155c354c50 Merge pull request #28 from jimeh/update-force-with-lease-link Jim Myhrberg 2026-01-10 07:13:14 +00:00
ed5db9db18 fix(best-practices): replace force-with-lease article link Jim Myhrberg 2026-01-10 07:12:07 +00:00
5c18e04f90 Merge pull request #27 from jimeh/conventional-commits-guidelines Jim Myhrberg 2026-01-10 07:00:47 +00:00
06d46881da feat(commits): update commit message guidelines to use conventional commits Jim Myhrberg 2026-01-10 06:59:35 +00:00
12daa305b3 Merge pull request #26 from jimeh/update-branch-terminology Jim Myhrberg 2026-01-10 06:54:29 +00:00
613f707ffe feat(terminology): replace "master" with "main" branch terminology Jim Myhrberg 2026-01-10 06:31:44 +00:00
be5f5dd71b Bump version to 1.0.0-rc.5 1.0.0-rc.5 Jim Myhrberg 2018-05-04 13:22:39 +01:00
db0232e3d2 Fix grammatical error Jim Myhrberg 2018-05-04 13:21:47 +01:00
849d11e478 Move up Summary section above Terminology Jim Myhrberg 2018-05-03 14:06:07 +01:00
b12361f619 Add an additional descriptive branch name example Jim Myhrberg 2018-01-30 13:02:29 +00:00
d4f4f88009 Improve wording of Summary section Jim Myhrberg 2018-01-30 13:02:04 +00:00
4c68267fb2 Add proper Summary section Jim Myhrberg 2017-12-29 01:33:03 +00:00
b7a264b37a Rename Summary section to Introduction Jim Myhrberg 2017-12-29 01:32:42 +00:00
4f6b8f8e15 Improve grammar and clarify reason for using PR's for help/feedback Jim Myhrberg 2017-12-29 01:32:02 +00:00
aa896fa87d Minor rewording Jim Myhrberg 2017-12-29 01:31:20 +00:00
af2ed13214 Update FAQ about descriptive names with ticket number recommendation Jim Myhrberg 2017-12-29 01:30:31 +00:00
7cef6f71cc Change "off of" to "from", fixing #19 Jim Myhrberg 2017-12-28 21:40:47 +00:00
6f08b0e41c Merge pull request #16 from jimeh/update-license Jim Myhrberg 2017-10-08 13:54:32 +01:00
bfc57413ef Update CC BY license from 3.0 to 4.0 Jim Myhrberg 2017-10-08 13:48:52 +01:00
0388ab8ecb Update link to author's website. Jim Myhrberg 2017-10-08 13:43:34 +01:00
9ee29c7e2a Bump version to 1.0.0-rc.4 1.0.0-rc.4 Jim Myhrberg 2017-08-29 02:02:52 +01:00
6bacc41545 Merge pull request #5 from jimeh/add-faq-section Jim Myhrberg 2017-08-29 01:58:23 +01:00
5f9513df4d Fix typo Jim Myhrberg 2017-08-27 00:17:38 +01:00
741dda313e Improve grammar of descriptive name FAQ question Jim Myhrberg 2017-08-26 23:55:46 +01:00
f4da274468 Fix typo Jim Myhrberg 2017-08-26 23:55:32 +01:00
d3e6630e2e Improve style of FAQ section Jim Myhrberg 2017-08-26 23:51:24 +01:00
6735136a5d Add answer to hotfix with broken master FAQ question Jim Myhrberg 2017-08-26 23:25:49 +01:00
77332f5f9a Add answer to "what does describe name mean?" FAQ question Jim Myhrberg 2017-08-26 23:20:34 +01:00
68e0502dac Add Common-Flow vs GitHub Flow FAQ question Jim Myhrberg 2017-08-26 23:19:54 +01:00
927a00a7bd Add answer to Common-Flow vs Git Flow FAQ question Jim Myhrberg 2017-08-26 23:19:16 +01:00
34cb2c20e0 Add Git Flow question Jim Myhrberg 2017-08-26 20:53:19 +01:00
f7170875d0 Start work on FAQ section Jim Myhrberg 2017-07-17 23:37:08 +01:00
6a56ee1c40 Merge pull request #13 from jimeh/allow-rebase-or-merge-update Jim Myhrberg 2017-08-29 01:54:33 +01:00
610d131dd5 Minor rewording Jim Myhrberg 2017-08-25 13:15:31 +01:00
0b2cde114a Enforce change branch update via rebase, allow merge if really needed Jim Myhrberg 2017-08-25 09:42:40 +01:00
4fd8d2f639 Allow updating change branches via rebase or merge Jim Myhrberg 2017-08-08 21:15:00 +01:00
5cecf7dd84 Update terminology section to reflect recent changes to spec Jim Myhrberg 2017-08-27 00:14:25 +01:00
045eded571 Swap order of "git add -i" and "git add -p" Jim Myhrberg 2017-08-26 20:45:39 +01:00
399c5bf27a Recommend to not use a "v" prefix in release tags Jim Myhrberg 2017-08-26 20:43:16 +01:00
eb1048f3c0 Fix grammar mistakes Jim Myhrberg 2017-08-26 20:42:29 +01:00
264e5c3ee9 Be a bit less strict about separate branches for each change Jim Myhrberg 2017-08-25 13:11:33 +01:00
31ee540bd9 Break apart first Change Branch requirement into four separate ones Jim Myhrberg 2017-08-25 13:08:49 +01:00
efe86ce5ba Merge pull request #14 from jimeh/encourage-clean-git-history Jim Myhrberg 2017-08-14 11:21:01 +01:00
7b90cfd10d Encourage a clean commit history within pull requests Jim Myhrberg 2017-08-08 21:42:56 +01:00
62f817a5ea Update release branch sections Jim Myhrberg 2017-08-08 20:50:55 +01:00
7858131cf5 Merge pull request #12 from jimeh/optional-hard-coded-version Jim Myhrberg 2017-08-04 12:15:14 +01:00
72335f9049 Make hard-coded version string and version bump commits optional Jim Myhrberg 2017-07-30 02:48:45 +01:00
587e5e5a86 Merge pull request #10 from connec/patch-1 Jim Myhrberg 2017-07-25 11:22:35 +01:00
5179942226 Fix capitalisation of RFC 2119 key word Chris Connelly 2017-07-25 10:57:05 +01:00
ce93a540fe Merge pull request #7 from Pavling/feature/extend-git-add-options Jim Myhrberg 2017-07-25 10:38:30 +01:00
4b4fa6d8b9 adding to the recommendation of doing an interactive 'git add' to show the shortcut to patching Michael Pavling 2017-07-25 09:05:14 +01:00
fd8411c652 Bump version to 1.0.0-rc.3 1.0.0-rc.3 Jim Myhrberg 2017-07-12 14:39:21 +01:00
34e846590c Link directly to Commit Guidelines section Jim Myhrberg 2017-07-12 14:35:52 +01:00
e71ed502ca Reword summary slightly Jim Myhrberg 2017-07-12 14:35:35 +01:00
5c813abe56 Merge pull request #4 from jimeh/remove-bleeding-edge-terminology Jim Myhrberg 2017-07-11 13:30:54 +01:00
40bfd924d4 Pre-release releases are not safe for production use Jim Myhrberg 2017-07-10 21:13:01 +01:00
7ed4cdf687 Remove "bleeding edge" terminology Jim Myhrberg 2017-07-10 21:00:45 +01:00
a65d82f791 Update TL;DR summary Jim Myhrberg 2017-07-09 21:47:59 +01:00
bdc4e35391 Bump version to 1.0.0-rc.2 1.0.0-rc.2 Jim Myhrberg 2017-07-09 20:26:13 +01:00
32cc2b944c Move hard-coded version string into a VERSION file Jim Myhrberg 2017-07-09 20:11:50 +01:00
e67812ca11 Minor fixes Jim Myhrberg 2017-07-09 20:09:53 +01:00
5c783bc234 Add best practice about not using "git commit -a" Jim Myhrberg 2017-07-07 16:32:59 +01:00
90a6abc1c3 Don't allow mixing "v" prefix and non-prefix tags Jim Myhrberg 2017-07-07 16:32:27 +01:00
1362060294 Break pull request information into it's own section Jim Myhrberg 2017-07-07 16:31:40 +01:00
4b1dac4d2d Restructure release branch sections Jim Myhrberg 2017-07-06 00:46:19 +01:00
ba6fac3692 Initial reworking of maintenance branches into release branches Jim Myhrberg 2017-07-06 00:33:53 +01:00
1640809047 Update diagram Jim Myhrberg 2017-07-04 09:14:39 +01:00
0b429bf254 Bump version to 1.0.0-rc.1 1.0.0-rc.1 Jim Myhrberg 2017-07-03 21:28:40 +01:00
05f9c5d9a4 Add basic diagram Jim Myhrberg 2017-07-03 19:40:33 +01:00
6449a8f3c1 Bump version to 1.0.0-draft.10 1.0.0-draft.10 Jim Myhrberg 2017-07-03 15:42:00 +01:00
3f31908876 Update links to be compatible with GitHub Pages Jim Myhrberg 2017-07-03 15:39:54 +01:00
727f207b26 Bump version to 1.0.0-draft.9 1.0.0-draft.9 Jim Myhrberg 2017-07-03 14:50:04 +01:00
d0c03c8692 Merge pull request #1 from alexmreis/add-merge-recommendation Jim Myhrberg 2017-07-03 14:40:37 +01:00
abc2d4350f Update common-flow.md Alexandre M. Reis 2017-07-03 15:36:09 +02:00
82e481ebd9 Include git merge --no-ff in best practices Alexandre M. Reis 2017-07-03 15:28:29 +02:00
c643f1472c Bump version to 1.0.0-draft.8 1.0.0-draft.8 Jim Myhrberg 2017-07-03 11:17:39 +01:00
a97af1fe6a Expand "Commit Message" section to "Git Best Practices" Jim Myhrberg 2017-07-03 11:16:49 +01:00
2a3582ef53 Add requirement of pushing change branch after rebashing Jim Myhrberg 2017-07-03 11:15:14 +01:00
9c1cbfb767 Clean up summary wording slightly Jim Myhrberg 2017-07-03 11:14:35 +01:00
52b30ccd6c Bump version to 1.0.0-draft.7 1.0.0-draft.7 Jim Myhrberg 2017-07-02 22:10:55 +01:00
97dc8e202a Remove two requirements which are a bit out of scope Jim Myhrberg 2017-07-02 22:10:03 +01:00
0b9eb0e749 Fix a typo Jim Myhrberg 2017-07-02 22:09:51 +01:00
d6ad820314 Use less forful language around committing often locally Jim Myhrberg 2017-07-02 22:09:13 +01:00
232712591f Bump version to 1.0.0-draft.6 1.0.0-draft.6 Jim Myhrberg 2017-07-02 19:12:47 +01:00
a6318ab0bc Update and fix wording in terminology section Jim Myhrberg 2017-07-02 19:12:21 +01:00
916e130551 Bump version to 1.0.0-draft.5 1.0.0-draft.5 Jim Myhrberg 2017-07-02 19:07:47 +01:00
96bd8e3a92 Update terminology, and turn it into it's own section Jim Myhrberg 2017-07-02 19:07:19 +01:00
684551895a Bump version to 1.0.0-draft.4 1.0.0-draft.4 Jim Myhrberg 2017-07-02 18:57:37 +01:00