@@ -9,9 +9,7 @@ easy and effective for everyone involved.
9
9
10
10
The https://github.com/repaint-io/maven-tiles/issues[issue tracker] is
11
11
the preferred channel for reporting all bugs or feature requests for the
12
- plugin. Pull requests are accepted but will be managed via
13
- https://review.gerrithub.io/#/q/project:repaint-io/maven-tiles[GerritHub.io] ( see below )
14
- but please respect the following restrictions:
12
+ plugin.
15
13
16
14
* Please **do not** use the issue tracker for personal support requests.
17
15
@@ -21,73 +19,15 @@ but please respect the following restrictions:
21
19
* Please **do not** derail or troll issues. Keep the discussion on topic and
22
20
respect the opinions of others.
23
21
24
- === GerritHub.io
22
+ === Submitting a patch
25
23
26
- Rather than using Github's Pull Request model, the _tiles-maven-plugin_ is using the
27
- https://code.google.com/p/gerrit/[Gerrit] code review tool via the public http://gerrithub.io[GerritHub.io]
28
- service for pre-merge code review.
24
+ Pull requests are accepted and managed via Github but please respect the following restrictions:
29
25
30
- Github pull requests SHOULD be automatically pulled into GerritHub as reviews, and any
31
- updated changes will be expected to be pushed/managed via GerritHub.io, however direct review submissions
32
- via GerritHub.io are preferred.
33
-
34
- ==== Submission via GerritHub
35
-
36
- Clone the repository::
37
- [source,shell]
38
- ----
39
- git clone https://review.gerrithub.io/repaint-io/maven-tiles
40
- ----
41
-
42
- Install Gerrit Commit Message Hook::
43
- [source,shell]
44
- ----
45
- curl -Lo .git/hooks/commit-msg http://review.gerrithub.io/tools/hooks/commit-msg
46
- ----
47
-
48
- Make changes and submit::
49
- [source,shell]
50
- ----
51
- git add ...
52
- git commit ...
53
- git push origin HEAD:refs/for/master
54
- ----
55
-
56
- Update changes and resubmit::
57
- [source,shell]
58
- ----
59
- git add ...
60
- git commit --amend ...
61
- git push origin HEAD:refs/for/master
62
- ----
63
-
64
- **IMPORTANT**: By submitting a patch, you agree to allow the project owners to
26
+ NOTE: **IMPORTANT**: By submitting a patch, you agree to allow the project owners to
65
27
license your work under the terms of the Apache 2.0 License.
66
28
67
- If you've already forked the Maven Tiles Github repository, you can configure
68
- your existing clone to support GerritHub submission as follows:
29
+ Please do not over-commit, make each commit meaningful and consider squashing your commits. We may
30
+ ask you to do that before considering merging your commit. Our ideal is one commit per
31
+ issue if possible.
32
+
69
33
70
- Configure an existing clone::
71
- [source,shell]
72
- ----
73
- git remote add gerrithub https://review.gerrithub.io/repaint-io/maven-tiles
74
- ----
75
- Install Gerrit Commit Message Hook::
76
- [source,shell]
77
- ----
78
- curl -Lo .git/hooks/commit-msg http://review.gerrithub.io/tools/hooks/commit-msg
79
- ----
80
- Make changes and submit::
81
- [source,shell]
82
- ----
83
- git add ...
84
- git commit ...
85
- git push gerrithub HEAD:refs/for/master
86
- ----
87
- Update changes and resubmit::
88
- [source,shell]
89
- ----
90
- git add ...
91
- git commit --amend ...
92
- git push gerrithub HEAD:refs/for/master
93
- ----
0 commit comments