Skip to content

Commit bb39aa0

Browse files
committed
Merge branch 'request/42' into bugfix/1.7.3
2 parents 3aec226 + bf89ec3 commit bb39aa0

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
### main commands
1414

1515
Control your remote git hosting services from the `git` commandline. The usage is
16-
very simple. To clone a new project, out of github, just issue:
16+
very simple. To clone a new project, out of GitHub, just issue:
1717

1818
% git hub clone guyzmo/git-repo
1919

20-
But that works also with a project from gitlab, bitbucket, or your own gitlab:
20+
But that works also with a project from GitLab, Bitbucket, or your own GitLab:
2121

2222
% git lab clone guyzmo/git-repo
2323
% git bb clone guyzmo/git-repo
@@ -57,7 +57,7 @@ Also, you can open the repository's page, using the `open` command:
5757

5858
### Requests for merges *(aka Pull Requests aka Merge Requests)*
5959

60-
Once you're all set with your repository, you can check requests to merge
60+
Once you're all set with your repository, you can check requests to merge
6161
(aka Pull Requests on github) using the `request` command:
6262

6363
% git hub request guyzmo/git-repo list
@@ -166,7 +166,7 @@ for the service you use:
166166

167167
% git-repo bit clone guyzmo/git-repo
168168

169-
Also, you can setup your own gitlab self-hosted server, using that configuration:
169+
Also, you can setup your own GitLab self-hosted server, using that configuration:
170170

171171
[gitrepo "myprecious"]
172172
type = gitlab
@@ -188,7 +188,7 @@ So you can run the tool as a git subcommand:
188188
### Development
189189

190190
For development, I like to use `buildout`, and the repository is already configured
191-
for that. All you have to do, is install buildout, and then call it from the root of
191+
for that. All you have to do, is install buildout, and then call it from the root of
192192
the repository:
193193

194194
% pip install zc.buildout
@@ -214,19 +214,19 @@ and a real connection, when testing the API on minor changes. Those recordings a
214214
called cassettes, thanks to the [betamax](https://github.com/sigmavirus24/betamax) framework
215215
being in use in the test suites.
216216

217-
When running existing tests, based on the provided cassettes, you don't need any
217+
When running existing tests, based on the provided cassettes, you don't need any
218218
setting. Also, if you've got a configuration in `~/.gitconfig`, the tests will use
219219
them. Anyway, you can use environment variables for those settings (environment
220220
variables will have precedence over the configuration settings):
221221

222222
To use your own credentials, you can setup the following environment variables:
223223

224-
* `GITHUB_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on github
225-
* `GITLAB_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on gitlab
226-
* `BITBUCKET_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on bitbucket
227-
* `PRIVATE_KEY_GITHUB` your private token you've setup on github for your account
228-
* `PRIVATE_KEY_GITLAB` your private token you've setup on gitlab for your account
229-
* `PRIVATE_KEY_BITBUCKET` your private token you've setup on bitbucket for your account
224+
* `GITHUB_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on GitHub
225+
* `GITLAB_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on GitLab
226+
* `BITBUCKET_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on Bitbucket
227+
* `PRIVATE_KEY_GITHUB` your private token you've setup on GitHub for your account
228+
* `PRIVATE_KEY_GITLAB` your private token you've setup on GitLab for your account
229+
* `PRIVATE_KEY_BITBUCKET` your private token you've setup on Bitbucket for your account
230230

231231
### TODO
232232

0 commit comments

Comments
 (0)