@@ -12,23 +12,23 @@ review.
12
12
13
13
### Option 1: GitHub
14
14
15
- 1 . Setup a GitHub account (http://github.com/ ), if you haven't yet
16
- 2 . Fork the ZF1 repository (http://github.com/zendframework/zf1 )
17
- 3 . Clone your fork locally and enter it (use your own GitHub username
18
- in the statement below)
15
+ 1 . Setup a GitHub account (http://github.com/ ), if you haven't yet
16
+ 2 . Fork the ZF1 repository (http://github.com/zendframework/zf1 )
17
+ 3 . Clone your fork locally and enter it (use your own GitHub username
18
+ in the statement below)
19
19
20
- ``` sh
21
- % git clone
[email protected] :
< username
> /zf1.git
22
- % cd zf2
23
- ```
20
+ ``` sh
21
+ % git clone
[email protected] :
< username
> /zf1.git
22
+ % cd zf2
23
+ ```
24
24
25
- 4. Add a remote to the canonical ZF repository, so you can keep your fork
26
- up-to-date:
25
+ 4 . Add a remote to the canonical ZF repository, so you can keep your fork
26
+ up-to-date:
27
27
28
- ` ` ` sh
29
- % git remote add zf1 https://github.com/zendframework/zf1.git
30
- % git fetch zf1
31
- ` ` `
28
+ ``` sh
29
+ % git remote add zf1 https://github.com/zendframework/zf1.git
30
+ % git fetch zf1
31
+ ```
32
32
33
33
### Option 2: Personal Repository
34
34
@@ -38,38 +38,38 @@ own repository. If you go this route, we will assume you have the knowledge to
38
38
do so, or know where to obtain it. We will not assist you in setting up such a
39
39
repository.
40
40
41
- 1. Create a new repository
41
+ 1 . Create a new repository
42
42
43
- ` ` ` sh
44
- % git init
45
- ` ` `
43
+ ``` sh
44
+ % git init
45
+ ```
46
46
47
- 2. Add an " origin" remote pointing to your gitosis/gitolite repo:
47
+ 2 . Add an "origin" remote pointing to your gitosis/gitolite repo:
48
48
49
- ` ` ` sh
50
- % git remote add origin git://yourdomain/yourrepo.git
51
- ` ` `
49
+ ``` sh
50
+ % git remote add origin git://yourdomain/yourrepo.git
51
+ ```
52
52
53
- 3. Add a remote for the ZF repository and fetch it
53
+ 3 . Add a remote for the ZF repository and fetch it
54
54
55
- ` ` ` sh
56
- % git remote add zf1 https://github.com/zendframework/zf1.git
57
- % git fetch zf1
58
- ` ` `
55
+ ``` sh
56
+ % git remote add zf1 https://github.com/zendframework/zf1.git
57
+ % git fetch zf1
58
+ ```
59
59
60
- 4. Create a new branch for the ZF repository (named " zf/master" here)
60
+ 4 . Create a new branch for the ZF repository (named "zf/master" here)
61
61
62
- ` ` ` sh
63
- % git checkout -b zf/master zf1/master
64
- ` ` `
62
+ ``` sh
63
+ % git checkout -b zf/master zf1/master
64
+ ```
65
65
66
- 5. Create your master branch off the ZF branch, and push to your
67
- repository
66
+ 5 . Create your master branch off the ZF branch, and push to your
67
+ repository
68
68
69
- ` ` ` sh
70
- % git checkout -b master
71
- % git push origin HEAD:master
72
- ` ` `
69
+ ``` sh
70
+ % git checkout -b master
71
+ % git push origin HEAD:master
72
+ ```
73
73
74
74
## Contributor License Agreement and your git configuration
75
75
@@ -117,12 +117,12 @@ as of merging your changes into the canonical repository.
117
117
118
118
A typical work flow will then consist of the following:
119
119
120
- 1. Create a new local branch based off your master branch.
121
- 2. Switch to your new local branch. (This step can be combined with the
122
- previous step with the use of ` git checkout -b` .)
123
- 3. Do some work, commit, repeat as necessary.
124
- 4. Push the local branch to your remote repository.
125
- 5. Send a pull request.
120
+ 1 . Create a new local branch based off your master branch.
121
+ 2 . Switch to your new local branch. (This step can be combined with the
122
+ previous step with the use of ` git checkout -b ` .)
123
+ 3 . Do some work, commit, repeat as necessary.
124
+ 4 . Push the local branch to your remote repository.
125
+ 5 . Send a pull request.
126
126
127
127
The mechanics of this process are actually quite trivial. Below, we will
128
128
create a branch for fixing an issue in the tracker.
@@ -160,13 +160,13 @@ your repository, select the branch you just created, and then select the
160
160
If using your own repository - or even if using GitHub - you can send an
161
161
email indicating you have changes to pull:
162
162
163
-
163
+
164
164
165
- - In your message, specify:
166
- - The URL to your repository (e.g., ` git://mwop.net/zf1.git` )
167
- - The branch containing the changes you want pulled (e.g., ` zf9295` )
168
- - The nature of the changes (e.g., ` implements
169
- Zend_Service_Twitter` , ` fixes ZF-9295` , etc.)
165
+ - In your message, specify:
166
+ - The URL to your repository (e.g., ` git://mwop.net/zf1.git ` )
167
+ - The branch containing the changes you want pulled (e.g., ` zf9295 ` )
168
+ - The nature of the changes (e.g., `implements
169
+ Zend_Service_Twitter` , ` fixes ZF-9295`, etc.)
170
170
171
171
### What branch to issue the pull request against?
172
172
@@ -186,24 +186,23 @@ get a ton of branches both locally and on your remote.
186
186
Once you know that your changes have been accepted to the master
187
187
repository, we suggest doing some cleanup of these branches.
188
188
189
- - Local branch cleanup
189
+ - Local branch cleanup
190
190
191
- ```sh
192
- % git branch -d <branchname>
193
- ```
194
-
195
- - Remote branch removal
191
+ ``` sh
192
+ % git branch -d < branchname>
193
+ ```
196
194
197
- ```sh
198
- % git push origin :<branchname>
199
- ```
195
+ - Remote branch removal
200
196
197
+ ``` sh
198
+ % git push origin :< branchname>
199
+ ```
201
200
202
201
## FEEDS AND EMAILS
203
202
204
203
RSS feeds may be found at:
205
204
206
- `https://github.com/zendframework/zf1/commits/<branch>.atom`
205
+ - ` https://github.com/zendframework/zf1/commits/<branch>.atom `
207
206
208
207
where < ; branch> ; is a branch in the repository.
209
208
0 commit comments