DawnMagnet/tldr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*: shellcheck and fix typos (#6526)

Browse Source 
* test.sh: quote a variable

* contributing-guides/*: fix typos

* pages/*: fix typos

* scripts/*: fix typos

* MAINTAINERS.md: trim trailing whitespace

Co-authored-by: a1346054 <36859588+a1346054@users.noreply.github.com>
This commit is contained in:
a1346054
2021-09-16 03:32:13 +00:00
committed by GitHub
parent 9c6d2865dc
commit 5c62e303b5
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contributing-guides/git-terminal.md
View File

@@ -51,7 +51,7 @@ git fetch upstream main
git rebase upstream/main # in case you have any merge conflicts, click the link below to see how to resolve them
git push --force-with-lease # not needed if you only want to update your local repository
```
[How to resolve merge conficts](https://docs.github.com/en/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line)
[How to resolve merge conflicts](https://docs.github.com/en/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line)
# Changing the email of your last commit
@@ -75,7 +75,7 @@ Let's take this commit history as an example:
| E | correct@example.org
| F (HEAD) | correct@example.org
To change the email of commts A and D, run
To change the email of commits A and D, run
```bash
git reset A

2
contributing-guides/translation-templates/subcommand-mention.md
View File

@@ -1,6 +1,6 @@
# Mentioning sub-commands
When a command has a sub-command, which can't be covered in the original page, it get's its own page.
When a command has a sub-command, which can't be covered in the original page, it gets its own page.
An example for this is `git` and it's sub-command pages like `git-commit`, `git-push`, etc.
In order to notify the user that such sub-command pages exist, we put a little notice in the base command's description.
This file contains the translation templates of this notice.