paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs: Fix lint/whitespace errors in GCI docs.

Browse Source
This commit is contained in:
Vaida Plankyte
2017-06-16 15:03:51 +01:00
committed by showell
parent 72d126ab78
commit 0ed4e22e54
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/fixing-commits.md
View File

@@ -1,5 +1,7 @@
# Fixing Commits # Fixing Commits
This is mostly from https://help.github.com/articles/changing-a-commit-message/#rewriting-the-most-recent-commit-message This is mostly from
[here](https://help.github.com/articles/changing-a-commit-message/#rewriting-the-most-recent-commit-message).
## Fixing the last commit ## Fixing the last commit
### Changing the last commit message ### Changing the last commit message
1. `git commit --amend -m "New Message"` 1. `git commit --amend -m "New Message"`

6
docs/git-cheat-sheet-detailed.md
View File

@@ -20,7 +20,7 @@ Commands:
- diff - diff
- `git diff`: display the changes you have made to all files - `git diff`: display the changes you have made to all files
- `git diff --cached`: display the changes you have made to staged files - `git diff --cached`: display the changes you have made to staged files
- `git diff HEAD~2..`: display the 2 most recent changes you have made to files - `git diff HEAD~2..`: display the 2 most recent changes you have made to files
- fetch - fetch
- `git fetch origin`: fetch origin repository - `git fetch origin`: fetch origin repository
- `git fetch upstream`: fetch upstream repository - `git fetch upstream`: fetch upstream repository
@@ -34,7 +34,7 @@ Commands:
- `git push origin +branch-name`: push your commits to your origin repository - `git push origin +branch-name`: push your commits to your origin repository
- rebase - rebase
- `git rebase -i HEAD~3`: interactive rebasing current branch with first three items on HEAD - `git rebase -i HEAD~3`: interactive rebasing current branch with first three items on HEAD
- `git rebase -i master`: interactive rebasing current branch with master branch - `git rebase -i master`: interactive rebasing current branch with master branch
- `git rebase upstream/master`: rebasing current branch with master branch from upstream repository - `git rebase upstream/master`: rebasing current branch with master branch from upstream repository
- reflog - reflog
- `git reflog | head -10`: manage reference logs for the past 10 commits - `git reflog | head -10`: manage reference logs for the past 10 commits
@@ -50,5 +50,5 @@ Commands:
- `git show master`: display most recent commit on `master` - `git show master`: display most recent commit on `master`
- status - status
- `git status`: show the working tree status, unstaged and staged files - `git status`: show the working tree status, unstaged and staged files
[fix-commit]: fixing-commits.html [fix-commit]: fixing-commits.html

2
docs/git-cheat-sheet.md
View File

@@ -48,5 +48,5 @@ Commands:
- `git show master` - `git show master`
- status - status
- `git status` - `git status`
[fix-commit]: fixing-commits.html [fix-commit]: fixing-commits.html

2
docs/shell-tips.md
View File

@@ -13,7 +13,7 @@ If you're using Windows,
[these videos](https://www.youtube.com/playlist?list=PL6gx4Cwl9DGDV6SnbINlVUd0o2xT4JbMu) [these videos](https://www.youtube.com/playlist?list=PL6gx4Cwl9DGDV6SnbINlVUd0o2xT4JbMu)
may be useful too, but keep in mind that the following tips only apply to may be useful too, but keep in mind that the following tips only apply to
Linux/macOS environments (Unix shells). You can also use a tool, for example Linux/macOS environments (Unix shells). You can also use a tool, for example
[Cygwin](https://www.cygwin.com/), to have a Unix-like shell on Windows. [Cygwin](https://www.cygwin.com/), to have a Unix-like shell on Windows.
## The prompt (`$`) ## The prompt (`$`)

6
docs/working-copies.md
View File

@@ -18,13 +18,13 @@ the various working copies.
Sometimes you need to get commits. Here are some scenarios: Sometimes you need to get commits. Here are some scenarios:
- You may fork the official Zulip repo to your Github fork. - You may fork the official Zulip repo to your GitHub fork.
- You may fetch commits from the offical Zulip repo to your local copy. - You may fetch commits from the offical Zulip repo to your local copy.
- You occasionally may fetch commits from your forked copy. - You occasionally may fetch commits from your forked copy.
Sometimes you want to publish commits. Here are scenarios: Sometimes you want to publish commits. Here are scenarios:
- You push code from your local copy to your Github fork. (You usually - You push code from your local copy to your GitHub fork. (You usually
want to put the commit on a feature branch.) want to put the commit on a feature branch.)
- You submit a PR to the official Zulip repo. - You submit a PR to the official Zulip repo.
@@ -32,7 +32,7 @@ Finally, the Zulip core team will occasionally want your changes!
- The Zulip core team can accept your changes and add them to - The Zulip core team can accept your changes and add them to
the official repo, usually on the master branch. the official repo, usually on the master branch.
## Names ## Names
We call remote working copies of the repository by these short We call remote working copies of the repository by these short

2
tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py
View File

@@ -17,6 +17,8 @@ EXCLUDED_URLS = [
'https://calendar.google.com/calendar/embed?src=ktiduof4eoh47lmgcl2qunnc0o@group.calendar.google.com', 'https://calendar.google.com/calendar/embed?src=ktiduof4eoh47lmgcl2qunnc0o@group.calendar.google.com',
# Returns 409 errors to HEAD requests frequently # Returns 409 errors to HEAD requests frequently
'https://medium.freecodecamp.com', 'https://medium.freecodecamp.com',
# Returns 404 to HEAD requests unconditionally
'https://www.git-tower.com/blog/command-line-cheat-sheet/',
] ]