mirror of
https://github.com/zulip/zulip.git
synced 2025-10-31 20:13:46 +00:00
docs: Add spaces to “check out”, “log in”, “set up”, “sign up” as verbs.
“Checkout”, “login”, “setup”, and “signup” are nouns, not verbs. Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
committed by
Tim Abbott
parent
598601e8fc
commit
dd48dbd912
@@ -60,7 +60,7 @@ See also [fixing commits][fix-commit]
|
||||
- `git add foo.py bar.py`: add `foo.py` AND `bar.py` to the staging area
|
||||
- `git add -u`: Adds all tracked files to the staging area.
|
||||
- checkout
|
||||
- `git checkout -b new-branch-name`: create branch `new-branch-name` and switch/checkout to that new branch
|
||||
- `git checkout -b new-branch-name`: create branch `new-branch-name` and switch to/check out that new branch
|
||||
- `git checkout master`: switch to your `master` branch
|
||||
- `git checkout old-branch-name`: switch to an existing branch `old-branch-name`
|
||||
- commit
|
||||
|
||||
@@ -8,7 +8,7 @@ accepted. We also recommend you work on feature branches.
|
||||
|
||||
## Step 1a: Create your fork
|
||||
|
||||
The following steps you'll only need to do the first time you setup a machine
|
||||
The following steps you'll only need to do the first time you set up a machine
|
||||
for contributing to a given Zulip project. You'll need to repeat the steps for
|
||||
any additional Zulip projects ([list][github-zulip]) that you work on.
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ $ git remote add <username> https://github.com/<username>/zulip.git
|
||||
$ git fetch <username>
|
||||
```
|
||||
|
||||
Now you can checkout their branch just like you would any other. You can name
|
||||
Now you can check out their branch just like you would any other. You can name
|
||||
the branch anything you want, but using both the username and branch name will
|
||||
help you keep things organized.
|
||||
|
||||
@@ -24,9 +24,9 @@ You can choose to rename the branch if you prefer:
|
||||
git checkout -b <custombranchname> <username>/<branchname>
|
||||
```
|
||||
|
||||
## Checkout a pull request locally
|
||||
## Check out a pull request locally
|
||||
|
||||
Just as you can checkout any user's branch locally, you can also checkout any
|
||||
Just as you can check out any user's branch locally, you can also check out any
|
||||
pull request locally. GitHub provides a special syntax
|
||||
([details][github-help-co-pr-locally]) for this since pull requests are
|
||||
specific to GitHub rather than Git.
|
||||
|
||||
@@ -115,7 +115,7 @@ your pull request title with [WIP] if it is a [work-in-progress][wip-prs].
|
||||
If your pull request has an effect on the visuals of a component, you might want
|
||||
to include a screenshot of this change or a GIF of the interaction in your first
|
||||
comment. This will allow reviewers to comment on your changes without having to
|
||||
checkout your branch; you can find a list of tools you can use for this over
|
||||
check out your branch; you can find a list of tools you can use for this over
|
||||
[here][screenshots-gifs].
|
||||
|
||||
When ready, click the green **Create pull request** to submit the pull request.
|
||||
|
||||
@@ -57,7 +57,7 @@ configured in the step above:
|
||||
$ git fetch upstream
|
||||
```
|
||||
|
||||
Next, checkout your `master` branch and [rebase][gitbook-git-rebase] it on top
|
||||
Next, check out your `master` branch and [rebase][gitbook-git-rebase] it on top
|
||||
of `upstream/master`:
|
||||
|
||||
```
|
||||
|
||||
@@ -163,7 +163,7 @@ Deleting local branch review-original-5156 (was 5a1e982)
|
||||
## Merge conflict on yarn.lock file
|
||||
|
||||
If there is a merge conflict on yarn.lock, yarn should be run to
|
||||
regenerate the file. *Important* don't delete the yarn.lock file. Checkout the
|
||||
regenerate the file. *Important* don't delete the yarn.lock file. Check out the
|
||||
latest one from origin/master so that yarn knows the previous asset versions.
|
||||
|
||||
Run the following commands
|
||||
@@ -175,5 +175,5 @@ git rebase --continue
|
||||
```
|
||||
|
||||
[github-zulip-zulip]: https://github.com/zulip/zulip/
|
||||
[zulip-git-guide-fetch-pr]: ../git/collaborate.html#checkout-a-pull-request-locally
|
||||
[zulip-git-guide-fetch-pr]: ../git/collaborate.html#check-out-a-pull-request-locally
|
||||
[zulip-git-guide-ci]: ../git/cloning.html#step-3-configure-continuous-integration-for-your-fork
|
||||
|
||||
Reference in New Issue
Block a user