Update all files to use {% data %} (#15253)
* Add back changes from prior to purge * Manually fix some invalid Liquid * Updoot render-content * Improve test messages to show correct output * Run el scripto * Pass the remaining test
This commit is contained in:
@@ -20,7 +20,7 @@ Typically, you would use `git rebase` to:
|
||||
|
||||
{% warning %}
|
||||
|
||||
**Warning**: Because changing your commit history can make things difficult for everyone else using the repository, it's considered bad practice to rebase commits when you've already pushed to a repository. To learn how to safely rebase on {{ site.data.variables.product.product_location }}, see "[About pull request merges](/articles/about-pull-request-merges)."
|
||||
**Warning**: Because changing your commit history can make things difficult for everyone else using the repository, it's considered bad practice to rebase commits when you've already pushed to a repository. To learn how to safely rebase on {% data variables.product.product_location %}, see "[About pull request merges](/articles/about-pull-request-merges)."
|
||||
|
||||
{% endwarning %}
|
||||
|
||||
@@ -106,4 +106,4 @@ Breaking this information, from top to bottom, we see that:
|
||||
- [The "Git Branching" chapter from the _Pro Git_ book](https://git-scm.com/book/en/Git-Branching-Rebasing)
|
||||
- [The "Interactive Rebasing" chapter from the _Pro Git_ book](https://git-scm.com/book/en/Git-Tools-Rewriting-History#_changing_multiple)
|
||||
- "[Squashing commits with rebase](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)"
|
||||
- "[Syncing your branch](/desktop/contributing-to-projects/syncing-your-branch)" in the {{ site.data.variables.product.prodname_desktop }} documentation
|
||||
- "[Syncing your branch](/desktop/contributing-to-projects/syncing-your-branch)" in the {% data variables.product.prodname_desktop %} documentation
|
||||
|
||||
@@ -21,7 +21,7 @@ The best way to explain subtree merges is to show by example. We will:
|
||||
|
||||
### Setting up the empty repository for a subtree merge
|
||||
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
2. Create a new directory and navigate to it.
|
||||
```shell
|
||||
$ mkdir test
|
||||
|
||||
@@ -16,8 +16,8 @@ a completely different server.
|
||||
|
||||
You can only push to two types of URL addresses:
|
||||
|
||||
* An HTTPS URL like `https://{{ site.data.variables.command_line.backticks }}/user/repo.git`
|
||||
* An SSH URL, like `git@{{ site.data.variables.command_line.backticks }}:user/repo.git`
|
||||
* An HTTPS URL like `https://{% data variables.command_line.backticks %}/user/repo.git`
|
||||
* An SSH URL, like `git@{% data variables.command_line.backticks %}:user/repo.git`
|
||||
|
||||
Git associates a remote URL with a name, and your default remote is usually called `origin`.
|
||||
|
||||
|
||||
@@ -11,18 +11,18 @@ versions:
|
||||
The `git remote add` command takes two arguments:
|
||||
|
||||
* A remote name, for example, `origin`
|
||||
* A remote URL, for example, `https://{{ site.data.variables.command_line.backticks }}/user/repo.git`
|
||||
* A remote URL, for example, `https://{% data variables.command_line.backticks %}/user/repo.git`
|
||||
|
||||
For example:
|
||||
|
||||
```shell
|
||||
$ git remote add origin https://{{ site.data.variables.command_line.codeblock }}/<em>user</em>/<em>repo</em>.git
|
||||
$ git remote add origin https://{% data variables.command_line.codeblock %}/<em>user</em>/<em>repo</em>.git
|
||||
# Set a new remote
|
||||
|
||||
$ git remote -v
|
||||
# Verify new remote
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>user</em>/<em>repo</em>.git (fetch)
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>user</em>/<em>repo</em>.git (push)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>user</em>/<em>repo</em>.git (fetch)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>user</em>/<em>repo</em>.git (push)
|
||||
```
|
||||
|
||||
Not sure which URL to use? Check out "[Which remote URL should I use?](/articles/which-remote-url-should-i-use)"
|
||||
@@ -36,7 +36,7 @@ You may encounter these errors when trying to add a remote.
|
||||
This error means you've tried to add a remote with a name that already exists in your local repository:
|
||||
|
||||
```shell
|
||||
$ git remote add origin https://{{ site.data.variables.command_line.codeblock }}/octocat/Spoon-Knife
|
||||
$ git remote add origin https://{% data variables.command_line.codeblock %}/octocat/Spoon-Knife
|
||||
> fatal: remote origin already exists.
|
||||
```
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ versions:
|
||||
### Using Atom as your editor
|
||||
|
||||
1. Install [Atom](https://atom.io/). For more information, see "[Installing Atom](https://flight-manual.atom.io/getting-started/sections/installing-atom/)" in the Atom documentation.
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
3. Type this command:
|
||||
```shell
|
||||
$ git config --global core.editor "atom --wait"
|
||||
@@ -25,7 +25,7 @@ versions:
|
||||
### Using Visual Studio Code as your editor
|
||||
|
||||
1. Install [Visual Studio Code](https://code.visualstudio.com/) (VS Code). For more information, see "[Setting up Visual Studio Code](https://code.visualstudio.com/Docs/setup/setup-overview)" in the VS Code documentation.
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
3. Type this command:
|
||||
```shell
|
||||
$ git config --global core.editor "code --wait"
|
||||
@@ -34,7 +34,7 @@ versions:
|
||||
### Using Sublime Text as your editor
|
||||
|
||||
1. Install [Sublime Text](https://www.sublimetext.com/). For more information, see "[Installation](https://docs.sublimetext.io/guide/getting-started/installation.html)" in the Sublime Text documentation.
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
3. Type this command:
|
||||
```shell
|
||||
$ git config --global core.editor "subl -n -w"
|
||||
@@ -44,7 +44,7 @@ versions:
|
||||
|
||||
1. Install [TextMate](https://macromates.com/).
|
||||
2. Install TextMate's `mate` shell utility. For more information, see "[mate and rmate](https://macromates.com/blog/2011/mate-and-rmate/)" in the TextMate documentation.
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
4. Type this command:
|
||||
```shell
|
||||
$ git config --global core.editor "mate -w"
|
||||
@@ -64,7 +64,7 @@ versions:
|
||||
### Using Visual Studio Code as your editor
|
||||
|
||||
1. Install [Visual Studio Code](https://code.visualstudio.com/) (VS Code). For more information, see "[Setting up Visual Studio Code](https://code.visualstudio.com/Docs/setup/setup-overview)" in the VS Code documentation.
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
3. Type this command:
|
||||
```shell
|
||||
$ git config --global core.editor "code --wait"
|
||||
@@ -73,7 +73,7 @@ versions:
|
||||
### Using Sublime Text as your editor
|
||||
|
||||
1. Install [Sublime Text](https://www.sublimetext.com/). For more information, see "[Installation](https://docs.sublimetext.io/guide/getting-started/installation.html)" in the Sublime Text documentation.
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
3. Type this command:
|
||||
```shell
|
||||
$ git config --global core.editor "'C:/Program Files (x86)/sublime text 3/subl.exe' -w"
|
||||
@@ -82,7 +82,7 @@ versions:
|
||||
### Using Notepad++ as your editor
|
||||
|
||||
1. Install Notepad++ from https://notepad-plus-plus.org/. For more information, see "[Getting started](https://npp-user-manual.org/docs/getting-started/)" in the Notepad++ documentation.
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
3. Type this command:
|
||||
```shell
|
||||
$ git config --global core.editor "'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"
|
||||
@@ -94,7 +94,7 @@ versions:
|
||||
### Using Atom as your editor
|
||||
|
||||
1. Install [Atom](https://atom.io/). For more information, see "[Installing Atom](https://flight-manual.atom.io/getting-started/sections/installing-atom/)" in the Atom documentation.
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
3. Type this command:
|
||||
```shell
|
||||
$ git config --global core.editor "atom --wait"
|
||||
@@ -103,7 +103,7 @@ versions:
|
||||
### Using Visual Studio Code as your editor
|
||||
|
||||
1. Install [Visual Studio Code](https://code.visualstudio.com/) (VS Code). For more information, see "[Setting up Visual Studio Code](https://code.visualstudio.com/Docs/setup/setup-overview)" in the VS Code documentation.
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
3. Type this command:
|
||||
```shell
|
||||
$ git config --global core.editor "code --wait"
|
||||
@@ -112,7 +112,7 @@ versions:
|
||||
### Using Sublime Text as your editor
|
||||
|
||||
1. Install [Sublime Text](https://www.sublimetext.com/). For more information, see "[Installation](https://docs.sublimetext.io/guide/getting-started/installation.html)" in the Sublime Text documentation.
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
3. Type this command:
|
||||
```shell
|
||||
$ git config --global core.editor "subl -n -w"
|
||||
|
||||
@@ -4,13 +4,13 @@ redirect_from:
|
||||
- /firewalls-and-proxies/
|
||||
- /articles/caching-your-github-password-in-git
|
||||
- /github/using-git/caching-your-github-password-in-git
|
||||
intro: 'If you''re [cloning {{ site.data.variables.product.product_name }} repositories using HTTPS](/github/using-git/which-remote-url-should-i-use), you can use a credential helper to tell Git to remember your credentials.'
|
||||
intro: 'If you''re [cloning {% data variables.product.product_name %} repositories using HTTPS](/github/using-git/which-remote-url-should-i-use), you can use a credential helper to tell Git to remember your credentials.'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
---
|
||||
|
||||
If you clone {{ site.data.variables.product.product_name }} repositories using SSH, then you authenticate using an SSH key instead of using other credentials. For information about setting up an SSH connection, see "[Generating an SSH Key](/articles/generating-an-ssh-key)."
|
||||
If you clone {% data variables.product.product_name %} repositories using SSH, then you authenticate using an SSH key instead of using other credentials. For information about setting up an SSH connection, see "[Generating an SSH Key](/articles/generating-an-ssh-key)."
|
||||
|
||||
{% mac %}
|
||||
|
||||
@@ -50,7 +50,7 @@ Install Git and the `osxkeychain helper` and tell Git to use it.
|
||||
# Set git to use the osxkeychain credential helper
|
||||
```
|
||||
|
||||
The next time you clone an HTTPS URL that requires authentication, Git will prompt you for your username and password. {{ site.data.reusables.user_settings.password-authentication-deprecation }}
|
||||
The next time you clone an HTTPS URL that requires authentication, Git will prompt you for your username and password. {% data reusables.user_settings.password-authentication-deprecation %}
|
||||
|
||||
Once you've authenticated successfully, your credentials are stored in the macOS keychain and will be used every time you clone an HTTPS URL. You won't be required to type your credentials in to Git again unless you change your credentials.
|
||||
|
||||
|
||||
@@ -21,33 +21,33 @@ The `git remote set-url` command takes two arguments:
|
||||
* A new URL for the remote. For example:
|
||||
* If you're updating to use HTTPS, your URL might look like:
|
||||
```shell
|
||||
https://{{ site.data.variables.command_line.backticks }}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
https://{% data variables.command_line.backticks %}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
```
|
||||
* If you're updating to use SSH, your URL might look like:
|
||||
```shell
|
||||
git@{{ site.data.variables.command_line.codeblock }}:<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
git@{% data variables.command_line.codeblock %}:<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
```
|
||||
|
||||
### Switching remote URLs from SSH to HTTPS
|
||||
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
2. Change the current working directory to your local project.
|
||||
3. List your existing remotes in order to get the name of the remote you want to change.
|
||||
```shell
|
||||
$ git remote -v
|
||||
> origin git@{{ site.data.variables.command_line.codeblock }}:<em>USERNAME/REPOSITORY</em>.git (fetch)
|
||||
> origin git@{{ site.data.variables.command_line.codeblock }}:<em>USERNAME/REPOSITORY</em>.git (push)
|
||||
> origin git@{% data variables.command_line.codeblock %}:<em>USERNAME/REPOSITORY</em>.git (fetch)
|
||||
> origin git@{% data variables.command_line.codeblock %}:<em>USERNAME/REPOSITORY</em>.git (push)
|
||||
```
|
||||
4. Change your remote's URL from SSH to HTTPS with the `git remote set-url` command.
|
||||
```shell
|
||||
$ git remote set-url origin https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
$ git remote set-url origin https://{% data variables.command_line.codeblock %}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
```
|
||||
5. Verify that the remote URL has changed.
|
||||
```shell
|
||||
$ git remote -v
|
||||
# Verify new remote URL
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME/REPOSITORY</em>.git (fetch)
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME/REPOSITORY</em>.git (push)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>USERNAME/REPOSITORY</em>.git (fetch)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>USERNAME/REPOSITORY</em>.git (push)
|
||||
```
|
||||
|
||||
The next time you `git fetch`, `git pull`, or `git push` to the remote repository, you'll be asked for your GitHub username and password.
|
||||
@@ -57,24 +57,24 @@ The next time you `git fetch`, `git pull`, or `git push` to the remote repositor
|
||||
|
||||
### Switching remote URLs from HTTPS to SSH
|
||||
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
2. Change the current working directory to your local project.
|
||||
3. List your existing remotes in order to get the name of the remote you want to change.
|
||||
```shell
|
||||
$ git remote -v
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME/REPOSITORY</em>.git (fetch)
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME/REPOSITORY</em>.git (push)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>USERNAME/REPOSITORY</em>.git (fetch)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>USERNAME/REPOSITORY</em>.git (push)
|
||||
```
|
||||
4. Change your remote's URL from HTTPS to SSH with the `git remote set-url` command.
|
||||
```shell
|
||||
$ git remote set-url origin git@{{ site.data.variables.command_line.codeblock }}:<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
$ git remote set-url origin git@{% data variables.command_line.codeblock %}:<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
```
|
||||
5. Verify that the remote URL has changed.
|
||||
```shell
|
||||
$ git remote -v
|
||||
# Verify new remote URL
|
||||
> origin git@{{ site.data.variables.command_line.codeblock }}:<em>USERNAME/REPOSITORY</em>.git (fetch)
|
||||
> origin git@{{ site.data.variables.command_line.codeblock }}:<em>USERNAME/REPOSITORY</em>.git (push)
|
||||
> origin git@{% data variables.command_line.codeblock %}:<em>USERNAME/REPOSITORY</em>.git (fetch)
|
||||
> origin git@{% data variables.command_line.codeblock %}:<em>USERNAME/REPOSITORY</em>.git (push)
|
||||
```
|
||||
|
||||
### Troubleshooting
|
||||
@@ -86,7 +86,7 @@ You may encounter these errors when trying to change a remote.
|
||||
This error means that the remote you tried to change doesn't exist:
|
||||
|
||||
```shell
|
||||
$ git remote set-url sofake https://{{ site.data.variables.command_line.codeblock }}/octocat/Spoon-Knife
|
||||
$ git remote set-url sofake https://{% data variables.command_line.codeblock %}/octocat/Spoon-Knife
|
||||
> fatal: No such remote 'sofake'
|
||||
```
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ versions:
|
||||
|
||||
Every time you press <kbd>return</kbd> on your keyboard you insert an invisible character called a line ending. Different operating systems handle line endings differently.
|
||||
|
||||
When you're collaborating on projects with Git and {{ site.data.variables.product.product_name }}, Git might produce unexpected results if, for example, you're working on a Windows machine, and your collaborator has made a change in OS X.
|
||||
When you're collaborating on projects with Git and {% data variables.product.product_name %}, Git might produce unexpected results if, for example, you're working on a Windows machine, and your collaborator has made a change in OS X.
|
||||
|
||||
You can configure Git to handle line endings automatically so you can collaborate effectively with people who use different operating systems.
|
||||
|
||||
|
||||
@@ -12,9 +12,9 @@ If another person has pushed to the same branch as you, Git won't be able to pus
|
||||
|
||||
```shell
|
||||
$ git push origin master
|
||||
> To https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
> To https://{% data variables.command_line.codeblock %}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
> ! [rejected] master -> master (non-fast-forward)
|
||||
> error: failed to push some refs to 'https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME</em>/<em>REPOSITORY</em>.git'
|
||||
> error: failed to push some refs to 'https://{% data variables.command_line.codeblock %}/<em>USERNAME</em>/<em>REPOSITORY</em>.git'
|
||||
> To prevent you from losing history, non-fast-forward updates were rejected
|
||||
> Merge the remote changes (e.g. 'git pull') before pushing again. See the
|
||||
> 'Note about fast-forwards' section of 'git push --help' for details.
|
||||
|
||||
@@ -15,11 +15,11 @@ These commands are very useful when interacting with [a remote repository](/arti
|
||||
To grab a complete copy of another user's repository, use `git clone` like this:
|
||||
|
||||
```shell
|
||||
$ git clone https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
$ git clone https://{% data variables.command_line.codeblock %}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
|
||||
# Clones a repository to your computer
|
||||
```
|
||||
|
||||
You can choose from [several different URLs](/articles/which-remote-url-should-i-use) when cloning a repository. While logged in to {{ site.data.variables.product.prodname_dotcom }}, these URLs are available below the repository details:
|
||||
You can choose from [several different URLs](/articles/which-remote-url-should-i-use) when cloning a repository. While logged in to {% data variables.product.prodname_dotcom %}, these URLs are available below the repository details:
|
||||
|
||||

|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: Git workflows
|
||||
intro: '{{ site.data.variables.product.prodname_dotcom }} flow is a lightweight, branch-based workflow that supports teams and projects that deploy regularly.'
|
||||
intro: '{% data variables.product.prodname_dotcom %} flow is a lightweight, branch-based workflow that supports teams and projects that deploy regularly.'
|
||||
redirect_from:
|
||||
- /articles/what-is-a-good-git-workflow/
|
||||
- /articles/git-workflows
|
||||
@@ -8,4 +8,4 @@ versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
---
|
||||
You can adopt the {{ site.data.variables.product.prodname_dotcom }} flow method to standardize how your team functions and collaborates on {{ site.data.variables.product.prodname_dotcom }}. For more information, see "[GitHub flow](/github/collaborating-with-issues-and-pull-requests/github-flow)" and "[Understanding the GitHub flow](http://guides.github.com/overviews/flow/)" in the {{ site.data.variables.product.prodname_dotcom }} Guides.
|
||||
You can adopt the {% data variables.product.prodname_dotcom %} flow method to standardize how your team functions and collaborates on {% data variables.product.prodname_dotcom %}. For more information, see "[GitHub flow](/github/collaborating-with-issues-and-pull-requests/github-flow)" and "[Understanding the GitHub flow](http://guides.github.com/overviews/flow/)" in the {% data variables.product.prodname_dotcom %} Guides.
|
||||
|
||||
@@ -4,7 +4,7 @@ redirect_from:
|
||||
- /git-ignore/
|
||||
- /ignore-files/
|
||||
- /articles/ignoring-files
|
||||
intro: 'You can configure Git to ignore files you don''t want to check in to {{ site.data.variables.product.product_name }}.'
|
||||
intro: 'You can configure Git to ignore files you don''t want to check in to {% data variables.product.product_name %}.'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
@@ -17,7 +17,7 @@ To share the ignore rules with other users who clone the repository, commit the
|
||||
|
||||
GitHub maintains an official list of recommended *.gitignore* files for many popular operating systems, environments, and languages in the `github/gitignore` public repository. You can also use gitignore.io to create a *.gitignore* file for your operating system, programming language, or IDE. For more information, see "[github/gitignore](https://github.com/github/gitignore)" and the "[gitignore.io](https://www.gitignore.io/)" site.
|
||||
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
2. Navigate to the location of your Git repository.
|
||||
3. Create a *.gitignore* file for your repository.
|
||||
```shell
|
||||
@@ -36,7 +36,7 @@ $ git rm --cached <em>FILENAME</em>
|
||||
|
||||
You can also create a global *.gitignore* file to define a list of rules for ignoring files in every Git repository on your computer. For example, you might create the file at *~/.gitignore_global* and add some rules to it.
|
||||
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
2. Configure Git to use the exclude file *~/.gitignore_global* for all Git repositories.
|
||||
```shell
|
||||
$ git config --global core.excludesfile ~/.gitignore_global
|
||||
@@ -48,7 +48,7 @@ If you don't want to create a *.gitignore* file to share with others, you can cr
|
||||
|
||||
Use your favorite text editor to open the file called *.git/info/exclude* within the root of your Git repository. Any rule you add here will not be checked in, and will only ignore files for your local repository.
|
||||
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
2. Navigate to the location of your Git repository.
|
||||
3. Using your favorite text editor, open the file *.git/info/exclude*.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: Using Git
|
||||
intro: 'Learn common and advanced workflows in Git to enhance your experience using {{ site.data.variables.product.prodname_dotcom }}.'
|
||||
intro: 'Learn common and advanced workflows in Git to enhance your experience using {% data variables.product.prodname_dotcom %}.'
|
||||
redirect_from:
|
||||
- /categories/19/articles/
|
||||
- /categories/using-git
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: Managing remote repositories
|
||||
intro: 'Learn to work with your local repositories on your computer and remote repositories hosted on {{ site.data.variables.product.product_name }}.'
|
||||
intro: 'Learn to work with your local repositories on your computer and remote repositories hosted on {% data variables.product.product_name %}.'
|
||||
mapTopic: true
|
||||
redirect_from:
|
||||
- /categories/18/articles/
|
||||
|
||||
@@ -95,7 +95,7 @@ git fetch upstream
|
||||
> remote: Compressing objects: 100% (53/53), done.
|
||||
> remote: Total 62 (delta 27), reused 44 (delta 9)
|
||||
> Unpacking objects: 100% (62/62), done.
|
||||
> From https://{{ site.data.variables.command_line.codeblock }}/<em>octocat</em>/<em>repo</em>
|
||||
> From https://{% data variables.command_line.codeblock %}/<em>octocat</em>/<em>repo</em>
|
||||
> * [new branch] master -> upstream/master
|
||||
```
|
||||
|
||||
|
||||
@@ -19,17 +19,17 @@ These examples assume you're [cloning using HTTPS](/articles/which-remote-url-sh
|
||||
```shell
|
||||
$ git remote -v
|
||||
# View current remotes
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>OWNER/REPOSITORY</em>.git (fetch)
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>OWNER/REPOSITORY</em>.git (push)
|
||||
> destination https://{{ site.data.variables.command_line.codeblock }}/<em>FORKER/REPOSITORY</em>.git (fetch)
|
||||
> destination https://{{ site.data.variables.command_line.codeblock }}/<em>FORKER/REPOSITORY</em>.git (push)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>OWNER/REPOSITORY</em>.git (fetch)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>OWNER/REPOSITORY</em>.git (push)
|
||||
> destination https://{% data variables.command_line.codeblock %}/<em>FORKER/REPOSITORY</em>.git (fetch)
|
||||
> destination https://{% data variables.command_line.codeblock %}/<em>FORKER/REPOSITORY</em>.git (push)
|
||||
|
||||
$ git remote rm destination
|
||||
# Remove remote
|
||||
$ git remote -v
|
||||
# Verify it's gone
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>OWNER/REPOSITORY</em>.git (fetch)
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>OWNER/REPOSITORY</em>.git (push)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>OWNER/REPOSITORY</em>.git (fetch)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>OWNER/REPOSITORY</em>.git (push)
|
||||
```
|
||||
|
||||
{% warning %}
|
||||
|
||||
@@ -20,16 +20,16 @@ These examples assume you're [cloning using HTTPS](/articles/which-remote-url-sh
|
||||
```shell
|
||||
$ git remote -v
|
||||
# View existing remotes
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>OWNER</em>/<em>REPOSITORY</em>.git (fetch)
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>OWNER</em>/<em>REPOSITORY</em>.git (push)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>OWNER</em>/<em>REPOSITORY</em>.git (fetch)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>OWNER</em>/<em>REPOSITORY</em>.git (push)
|
||||
|
||||
$ git remote rename origin destination
|
||||
# Change remote name from 'origin' to 'destination'
|
||||
|
||||
$ git remote -v
|
||||
# Verify remote's new name
|
||||
> destination https://{{ site.data.variables.command_line.codeblock }}/<em>OWNER</em>/<em>REPOSITORY</em>.git (fetch)
|
||||
> destination https://{{ site.data.variables.command_line.codeblock }}/<em>OWNER</em>/<em>REPOSITORY</em>.git (push)
|
||||
> destination https://{% data variables.command_line.codeblock %}/<em>OWNER</em>/<em>REPOSITORY</em>.git (fetch)
|
||||
> destination https://{% data variables.command_line.codeblock %}/<em>OWNER</em>/<em>REPOSITORY</em>.git (push)
|
||||
```
|
||||
|
||||
### Troubleshooting
|
||||
@@ -45,8 +45,8 @@ You can check which remotes currently exist with the `git remote -v` command:
|
||||
```shell
|
||||
$ git remote -v
|
||||
# View existing remotes
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>OWNER</em>/<em>REPOSITORY</em>.git (fetch)
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>OWNER</em>/<em>REPOSITORY</em>.git (push)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>OWNER</em>/<em>REPOSITORY</em>.git (fetch)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>OWNER</em>/<em>REPOSITORY</em>.git (push)
|
||||
```
|
||||
|
||||
#### Remote [new name] already exists.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: Setting your username in Git
|
||||
intro: 'Git uses a username to associate commits with an identity. The Git username is not the same as your {{ site.data.variables.product.product_name }} username.'
|
||||
intro: 'Git uses a username to associate commits with an identity. The Git username is not the same as your {% data variables.product.product_name %} username.'
|
||||
redirect_from:
|
||||
- /articles/setting-your-username-in-git
|
||||
versions:
|
||||
@@ -8,20 +8,20 @@ versions:
|
||||
enterprise-server: '*'
|
||||
---
|
||||
|
||||
You can change the name that is associated with your Git commits using the `git config` command. The new name you set will be visible in any future commits you push to {{ site.data.variables.product.product_name }} from the command line. If you'd like to keep your real name private, you can use any text as your Git username.
|
||||
You can change the name that is associated with your Git commits using the `git config` command. The new name you set will be visible in any future commits you push to {% data variables.product.product_name %} from the command line. If you'd like to keep your real name private, you can use any text as your Git username.
|
||||
|
||||
Changing the name associated with your Git commits using `git config` will only affect future commits and will not change the name used for past commits.
|
||||
|
||||
### Setting your Git username for *every* repository on your computer
|
||||
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
|
||||
2. {{ site.data.reusables.user_settings.set_your_git_username }}
|
||||
2. {% data reusables.user_settings.set_your_git_username %}
|
||||
```shell
|
||||
$ git config --global user.name "<em>Mona Lisa</em>"
|
||||
```
|
||||
|
||||
3. {{ site.data.reusables.user_settings.confirm_git_username_correct }}
|
||||
3. {% data reusables.user_settings.confirm_git_username_correct %}
|
||||
```shell
|
||||
$ git config --global user.name
|
||||
> Mona Lisa
|
||||
@@ -29,16 +29,16 @@ Changing the name associated with your Git commits using `git config` will only
|
||||
|
||||
### Setting your Git username for a single repository
|
||||
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
|
||||
2. Change the current working directory to the local repository where you want to configure the name that is associated with your Git commits.
|
||||
|
||||
3. {{ site.data.reusables.user_settings.set_your_git_username }}
|
||||
3. {% data reusables.user_settings.set_your_git_username %}
|
||||
```shell
|
||||
$ git config user.name "<em>Mona Lisa</em>"
|
||||
```
|
||||
|
||||
3. {{ site.data.reusables.user_settings.confirm_git_username_correct }}
|
||||
3. {% data reusables.user_settings.confirm_git_username_correct %}
|
||||
```shell
|
||||
$ git config user.name
|
||||
> Mona Lisa
|
||||
|
||||
@@ -11,11 +11,11 @@ versions:
|
||||
|
||||
If you create a new clone of the repository, you won't lose any of your Git history or changes when you split a folder into a separate repository.
|
||||
|
||||
{{ site.data.reusables.command_line.open_the_multi_os_terminal }}
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
2. Change the current working directory to the location where you want to create your new repository.
|
||||
3. Clone the repository that contains the subfolder.
|
||||
```shell
|
||||
$ git clone https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME</em>/<em>REPOSITORY-NAME</em>
|
||||
$ git clone https://{% data variables.command_line.codeblock %}/<em>USERNAME</em>/<em>REPOSITORY-NAME</em>
|
||||
```
|
||||
4. Change the current working directory to your cloned repository.
|
||||
```shell
|
||||
@@ -42,8 +42,8 @@ If you create a new clone of the repository, you won't lose any of your Git hist
|
||||
```
|
||||
The repository should now only contain the files that were in your subfolder.
|
||||
|
||||
6. [Create a new repository](/articles/creating-a-new-repository/) on {{ site.data.variables.product.product_name }}.
|
||||
7. At the top of your new {{ site.data.variables.product.product_name }} repository's Quick Setup page, click {% octicon "clippy" aria-label="The copy to clipboard icon" %} to copy the remote repository URL.
|
||||
6. [Create a new repository](/articles/creating-a-new-repository/) on {% data variables.product.product_name %}.
|
||||
7. At the top of your new {% data variables.product.product_name %} repository's Quick Setup page, click {% octicon "clippy" aria-label="The copy to clipboard icon" %} to copy the remote repository URL.
|
||||

|
||||
|
||||
{% tip %}
|
||||
@@ -55,22 +55,22 @@ If you create a new clone of the repository, you won't lose any of your Git hist
|
||||
8. Check the existing remote name for your repository. For example, `origin` or `upstream` are two common choices.
|
||||
```shell
|
||||
$ git remote -v
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME/REPOSITORY-NAME</em>.git (fetch)
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME/REPOSITORY-NAME</em>.git (push)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>USERNAME/REPOSITORY-NAME</em>.git (fetch)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>USERNAME/REPOSITORY-NAME</em>.git (push)
|
||||
```
|
||||
|
||||
9. Set up a new remote URL for your new repository using the existing remote name and the remote repository URL you copied in step 7.
|
||||
```shell
|
||||
git remote set-url origin https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME/NEW-REPOSITORY-NAME</em>.git
|
||||
git remote set-url origin https://{% data variables.command_line.codeblock %}/<em>USERNAME/NEW-REPOSITORY-NAME</em>.git
|
||||
```
|
||||
10. Verify that the remote URL has changed with your new repository name.
|
||||
```shell
|
||||
$ git remote -v
|
||||
# Verify new remote URL
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME/NEW-REPOSITORY-NAME</em>.git (fetch)
|
||||
> origin https://{{ site.data.variables.command_line.codeblock }}/<em>USERNAME/NEW-REPOSITORY-NAME</em>.git (push)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>USERNAME/NEW-REPOSITORY-NAME</em>.git (fetch)
|
||||
> origin https://{% data variables.command_line.codeblock %}/<em>USERNAME/NEW-REPOSITORY-NAME</em>.git (push)
|
||||
```
|
||||
11. Push your changes to the new repository on {{ site.data.variables.product.product_name }}.
|
||||
11. Push your changes to the new repository on {% data variables.product.product_name %}.
|
||||
```shell
|
||||
git push -u origin <em>BRANCH-NAME</em>
|
||||
```
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: Updating credentials from the macOS Keychain
|
||||
intro: 'You''ll need to update your saved credentials in the `git-credential-osxkeychain` helper if you change your username, password, or personal access token on {{ site.data.variables.product.product_name }}.'
|
||||
intro: 'You''ll need to update your saved credentials in the `git-credential-osxkeychain` helper if you change your username, password, or personal access token on {% data variables.product.product_name %}.'
|
||||
redirect_from:
|
||||
- /articles/updating-credentials-from-the-osx-keychain
|
||||
- /github/using-git/updating-credentials-from-the-osx-keychain
|
||||
@@ -9,14 +9,14 @@ versions:
|
||||
enterprise-server: '*'
|
||||
---
|
||||
|
||||
{{ site.data.reusables.user_settings.password-authentication-deprecation }}
|
||||
{% data reusables.user_settings.password-authentication-deprecation %}
|
||||
|
||||
### Updating your credentials via Keychain Access
|
||||
|
||||
1. Click on the Spotlight icon (magnifying glass) on the right side of the menu bar. Type `Keychain access` then press the Enter key to launch the app.
|
||||

|
||||
2. In Keychain Access, search for **{{ site.data.variables.command_line.backticks }}**.
|
||||
3. Find the "internet password" entry for `{{ site.data.variables.command_line.backticks }}`.
|
||||
2. In Keychain Access, search for **{% data variables.command_line.backticks %}**.
|
||||
3. Find the "internet password" entry for `{% data variables.command_line.backticks %}`.
|
||||

|
||||
4. Edit or delete the entry accordingly.
|
||||
|
||||
@@ -29,15 +29,15 @@ To do this, type the following command:
|
||||
|
||||
```shell
|
||||
$ git credential-osxkeychain erase
|
||||
host={{ site.data.variables.command_line.codeblock }}
|
||||
host={% data variables.command_line.codeblock %}
|
||||
protocol=https
|
||||
> <em>[Press Return]</em>
|
||||
```
|
||||
|
||||
If it's successful, nothing will print out. To test that it works, try and clone
|
||||
a repository from {{ site.data.variables.product.product_location }}. If you are prompted for a password, the keychain
|
||||
a repository from {% data variables.product.product_location %}. If you are prompted for a password, the keychain
|
||||
entry was deleted.
|
||||
|
||||
### Further reading
|
||||
|
||||
- "[Caching your {{ site.data.variables.product.prodname_dotcom }} credentials in Git](/github/using-git/caching-your-github-credentials-in-git/)"
|
||||
- "[Caching your {% data variables.product.prodname_dotcom %} credentials in Git](/github/using-git/caching-your-github-credentials-in-git/)"
|
||||
|
||||
@@ -3,7 +3,7 @@ title: Which remote URL should I use?
|
||||
redirect_from:
|
||||
- /articles/which-url-should-i-use/
|
||||
- /articles/which-remote-url-should-i-use
|
||||
intro: 'There are several ways to clone repositories available on {{ site.data.variables.product.prodname_dotcom }}.'
|
||||
intro: 'There are several ways to clone repositories available on {% data variables.product.prodname_dotcom %}.'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
@@ -17,17 +17,17 @@ For information on setting or changing your remote URL, see "[Changing a remote'
|
||||
|
||||
The `https://` clone URLs are available on all repositories, public and private. These URLs work even if you are behind a firewall or proxy.
|
||||
|
||||
When you `git clone`, `git fetch`, `git pull`, or `git push` to a remote repository using HTTPS URLs on the command line, Git will ask for your {{ site.data.variables.product.product_name }} username and password. {{ site.data.reusables.user_settings.password-authentication-deprecation }}
|
||||
When you `git clone`, `git fetch`, `git pull`, or `git push` to a remote repository using HTTPS URLs on the command line, Git will ask for your {% data variables.product.product_name %} username and password. {% data reusables.user_settings.password-authentication-deprecation %}
|
||||
|
||||
{{ site.data.reusables.command_line.provide-an-access-token }}
|
||||
{% data reusables.command_line.provide-an-access-token %}
|
||||
|
||||
{% tip %}
|
||||
|
||||
**Tips**:
|
||||
|
||||
- You can use a credential helper so Git will remember your {{ site.data.variables.product.prodname_dotcom }} credentials every time it talks to {{ site.data.variables.product.prodname_dotcom }}. For more information, see "[Caching your {{ site.data.variables.product.prodname_dotcom }} credentials in Git](/github/using-git/caching-your-github-credentials-in-git)."
|
||||
- You can use a credential helper so Git will remember your {% data variables.product.prodname_dotcom %} credentials every time it talks to {% data variables.product.prodname_dotcom %}. For more information, see "[Caching your {% data variables.product.prodname_dotcom %} credentials in Git](/github/using-git/caching-your-github-credentials-in-git)."
|
||||
|
||||
- To clone a repository without authenticating to {{ site.data.variables.product.product_name }} on the command line, you can use {{ site.data.variables.product.prodname_desktop }} to clone instead. For more information, see "[Cloning a repository from {{ site.data.variables.product.prodname_dotcom }} to {{ site.data.variables.product.prodname_dotcom }} Desktop](/desktop/contributing-to-projects/cloning-a-repository-from-github-to-github-desktop)."
|
||||
- To clone a repository without authenticating to {% data variables.product.product_name %} on the command line, you can use {% data variables.product.prodname_desktop %} to clone instead. For more information, see "[Cloning a repository from {% data variables.product.prodname_dotcom %} to {% data variables.product.prodname_dotcom %} Desktop](/desktop/contributing-to-projects/cloning-a-repository-from-github-to-github-desktop)."
|
||||
|
||||
{% endtip %}
|
||||
|
||||
@@ -35,7 +35,7 @@ When you `git clone`, `git fetch`, `git pull`, or `git push` to a remote reposit
|
||||
|
||||
### Cloning with SSH URLs
|
||||
|
||||
SSH URLs provide access to a Git repository via SSH, a secure protocol. To use these URLs, you must generate an SSH keypair on your computer and add the **public** key to your {{ site.data.variables.product.product_name }} account. For more information, see "[Connecting to {{ site.data.variables.product.prodname_dotcom }} with SSH](/github/authenticating-to-github/connecting-to-github-with-ssh)."
|
||||
SSH URLs provide access to a Git repository via SSH, a secure protocol. To use these URLs, you must generate an SSH keypair on your computer and add the **public** key to your {% data variables.product.product_name %} account. For more information, see "[Connecting to {% data variables.product.prodname_dotcom %} with SSH](/github/authenticating-to-github/connecting-to-github-with-ssh)."
|
||||
|
||||
When you `git clone`, `git fetch`, `git pull`, or `git push` to a remote repository using SSH URLs, you'll be prompted for a password and must provide your SSH key passphrase. For more information, see "[Working with SSH key passphrases](/github/authenticating-to-github/working-with-ssh-key-passphrases)."
|
||||
|
||||
@@ -49,17 +49,17 @@ When you `git clone`, `git fetch`, `git pull`, or `git push` to a remote reposit
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}
|
||||
|
||||
### Cloning with {{ site.data.variables.product.prodname_cli }}
|
||||
### Cloning with {% data variables.product.prodname_cli %}
|
||||
|
||||
You can also install {{ site.data.variables.product.prodname_cli }} to use {{ site.data.variables.product.product_name }} workflows in your terminal. For more information, the [{{ site.data.variables.product.prodname_cli }}](https://cli.github.com/manual/) documentation.
|
||||
You can also install {% data variables.product.prodname_cli %} to use {% data variables.product.product_name %} workflows in your terminal. For more information, the [{% data variables.product.prodname_cli %}](https://cli.github.com/manual/) documentation.
|
||||
|
||||
{% endif %}
|
||||
|
||||
### Cloning with Subversion
|
||||
|
||||
You can also use a [Subversion](https://subversion.apache.org/) client to access any repository on {{ site.data.variables.product.prodname_dotcom }}. Subversion offers a different feature set than Git. For more information, see "[What are the differences between Subversion and Git?](/github/importing-your-projects-to-github/what-are-the-differences-between-subversion-and-git)"
|
||||
You can also use a [Subversion](https://subversion.apache.org/) client to access any repository on {% data variables.product.prodname_dotcom %}. Subversion offers a different feature set than Git. For more information, see "[What are the differences between Subversion and Git?](/github/importing-your-projects-to-github/what-are-the-differences-between-subversion-and-git)"
|
||||
|
||||
You can also access repositories on {{ site.data.variables.product.prodname_dotcom }} from Subversion clients. For more information, see "[Support for Subversion clients](/github/importing-your-projects-to-github/support-for-subversion-clients)."
|
||||
You can also access repositories on {% data variables.product.prodname_dotcom %} from Subversion clients. For more information, see "[Support for Subversion clients](/github/importing-your-projects-to-github/support-for-subversion-clients)."
|
||||
|
||||
### Further reading
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ versions:
|
||||
|
||||
Using an HTTPS remote URL has some advantages compared with using SSH. It's easier to set up than SSH, and usually works through strict firewalls and proxies. However, it also prompts you to enter your GitHub credentials every time you pull or push a repository.
|
||||
|
||||
You can avoid being prompted for your password by configuring Git to [cache your credentials](/github/using-git/caching-your-github-credentials-in-git) for you. {{ site.data.reusables.user_settings.password-authentication-deprecation }}
|
||||
You can avoid being prompted for your password by configuring Git to [cache your credentials](/github/using-git/caching-your-github-credentials-in-git) for you. {% data reusables.user_settings.password-authentication-deprecation %}
|
||||
|
||||
Once you've configured credential caching, Git automatically uses your cached personal access token in place of a password when you pull or push a repository using HTTPS.
|
||||
|
||||
@@ -18,5 +18,5 @@ Once you've configured credential caching, Git automatically uses your cached pe
|
||||
### Further reading
|
||||
|
||||
* "[Which remote URL should I use](/articles/which-remote-url-should-i-use/#cloning-with-https-urls)"
|
||||
* "[About authentication to {{ site.data.variables.product.prodname_dotcom }}](/github/authenticating-to-github/about-authentication-to-github)"
|
||||
* "[About authentication to {% data variables.product.prodname_dotcom %}](/github/authenticating-to-github/about-authentication-to-github)"
|
||||
* "[Adding your SSH key to the ssh-agent](/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent#adding-your-ssh-key-to-the-ssh-agent)"
|
||||
|
||||
Reference in New Issue
Block a user