Skip to content

Commit 5a20716

Browse files
Restructure and move Git content (#18336)
* Rename map topic * Delete map topic * Rename map topic * Add redirect * Remove last two map topics * Move article on adding a remote into a long-form guide * Move article on changing a remote's URL * Move articles on renaming and removing remotes * Move remote URL article * Fix typo * Remove category index file * Move a few articles to the new category * Move a few more files * Move managing remote repos article * Move the rest of the getting started with git map topic * Move the first half of the using git map topic * Move the rest of the articles and 🔥 the directory * Fix failing test * Remove Using Git from product index * Apply suggestions from code review Co-authored-by: Laura Coursen <lecoursen@github.com> * Apply suggestions from code review Co-authored-by: Laura Coursen <lecoursen@github.com>
1 parent c0f3c99 commit 5a20716

73 files changed

Lines changed: 397 additions & 487 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.pa11yci

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@
1313
"http://localhost:4001/en/actions",
1414
"http://localhost:4001/en/github/authenticating-to-github/creating-a-personal-access-token",
1515
"http://localhost:4001/en/github/authenticating-to-github/checking-for-existing-ssh-keys",
16-
"http://localhost:4001/en/github/using-git/changing-a-remotes-url",
16+
"http://localhost:4001/en/github/getting-started-with-github/managing-remote-repositories",
1717
"http://localhost:4001/en/github/getting-started-with-github/set-up-git",
1818
"http://localhost:4001/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository",
1919
"http://localhost:4001/en/github/writing-on-github/basic-writing-and-formatting-syntax",
2020
"http://localhost:4001/en/actions/reference/workflow-syntax-for-github-actions",
21-
"http://localhost:4001/en/github/using-git/which-remote-url-should-i-use",
21+
"http://localhost:4001/en/github/getting-started-with-github/about-remote-repositories",
2222
"http://localhost:4001/en/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-using-the-command-line",
23-
"http://localhost:4001/en/github/using-git/setting-your-username-in-git",
23+
"http://localhost:4001/en/github/getting-started-with-github/setting-your-username-in-git",
2424
"http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address",
2525
"http://localhost:4001/en/github/authenticating-to-github/configuring-two-factor-authentication",
26-
"http://localhost:4001/en/github/using-git/adding-a-remote",
2726
"http://localhost:4001/en/rest",
2827
"http://localhost:4001/en/github/working-with-github-pages/configuring-a-custom-domain-for-your-github-pages-site",
2928
"http://localhost:4001/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests",
@@ -55,7 +54,7 @@
5554
"http://localhost:4001/en/actions/getting-started-with-github-actions",
5655
"http://localhost:4001/en/actions/reference/events-that-trigger-workflows",
5756
"http://localhost:4001/en/desktop/getting-started-with-github-desktop/installing-github-desktop",
58-
"http://localhost:4001/en/github/using-git/ignoring-files",
57+
"http://localhost:4001/en/github/getting-started-with-github/ignoring-files",
5958
"http://localhost:4001/en/desktop",
6059
"http://localhost:4001/en/packages",
6160
"http://localhost:4001/en/actions/configuring-and-managing-workflows/configuring-a-workflow",
@@ -71,7 +70,7 @@
7170
"http://localhost:4001/en/actions/reference/context-and-expression-syntax-for-github-actions",
7271
"http://localhost:4001/en/github/managing-files-in-a-repository/navigating-code-on-github",
7372
"http://localhost:4001/en/github/teaching-and-learning-with-github-education/applying-for-a-student-developer-pack",
74-
"http://localhost:4001/en/github/using-git/caching-your-github-credentials-in-git",
73+
"http://localhost:4001/en/github/getting-started-with-github/caching-your-github-credentials-in-git",
7574
"http://localhost:4001/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request",
7675
"http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository",
7776
"http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account/changing-your-github-username",
@@ -81,7 +80,6 @@
8180
"http://localhost:4001/en/actions/configuring-and-managing-workflows/using-environment-variables",
8281
"http://localhost:4001/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets",
8382
"http://localhost:4001/en/github/authenticating-to-github/removing-sensitive-data-from-a-repository",
84-
"http://localhost:4001/en/github/using-git/removing-a-remote",
8583
"http://localhost:4001/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line",
8684
"http://localhost:4001/en/github/setting-up-and-managing-billing-and-payments-on-github/setting-your-billing-email",
8785
"http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account",
@@ -90,8 +88,8 @@
9088
"http://localhost:4001/en/github/authenticating-to-github/about-two-factor-authentication",
9189
"http://localhost:4001/en/github/working-with-github-pages/about-custom-domains-and-github-pages",
9290
"http://localhost:4001/en/github/searching-for-information-on-github/searching-code",
93-
"http://localhost:4001/en/github/using-git/configuring-git-to-handle-line-endings",
94-
"http://localhost:4001/en/github/using-git/getting-changes-from-a-remote-repository",
91+
"http://localhost:4001/en/github/getting-started-with-github/configuring-git-to-handle-line-endings",
92+
"http://localhost:4001/en/github/getting-started-with-github/getting-changes-from-a-remote-repository",
9593
"http://localhost:4001/en/github/authenticating-to-github/generating-a-new-gpg-key",
9694
"http://localhost:4001/en/github/authenticating-to-github/accessing-github-using-two-factor-authentication",
9795
"http://localhost:4001/en/github/creating-cloning-and-archiving-repositories/licensing-a-repository",

content/desktop/contributing-and-collaborating-using-github-desktop/cloning-and-forking-repositories-from-github-desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ You can change how a fork behaves with the upstream repository in {% data variab
4444
{% data reusables.desktop.select-fork-behavior %}
4545

4646
### Further reading
47-
- [About remote repositories](/github/using-git/about-remote-repositories)
47+
- [About remote repositories](/github/getting-started-with-github/about-remote-repositories)

content/desktop/contributing-and-collaborating-using-github-desktop/syncing-your-branch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ When you pull to your local branch, you only update your local copy of the repos
1515

1616
To add changes from one branch to another branch, you can merge the branches. To apply changes to your branch from another branch in the same repository, you can merge the other branch into your branch on {% data variables.product.prodname_desktop %}. To request that changes from your branch are merged into another branch, in the same repository or in another repository in the network, you can create a pull request on {% data variables.product.prodname_desktop %}. For more information, see "[Merging another branch into your project branch](#merging-another-branch-into-your-project-branch)" and "[About pull requests](/github/collaborating-with-issues-and-pull-requests/about-pull-requests)."
1717

18-
Some workflows require or benefit from rebasing instead of merging. By rebasing you can reorder, edit, or squash commits together. For more information, see "[About Git rebase](/articles/about-git-rebase)" and "[Rebasing your project branch onto another branch](#rebasing-your-project-branch-onto-another-branch)."
18+
Some workflows require or benefit from rebasing instead of merging. By rebasing you can reorder, edit, or squash commits together. For more information, see "[About Git rebase](/github/getting-started-with-github/about-git-rebase)" and "[Rebasing your project branch onto another branch](#rebasing-your-project-branch-onto-another-branch)."
1919

2020
### Pulling to your local branch from the remote
2121

content/desktop/installing-and-configuring-github-desktop/about-connections-to-github.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ versions:
1111

1212
After you authenticate to {% data variables.product.prodname_dotcom %}, you can connect to remote repositories with {% data variables.product.prodname_desktop %}. {% data variables.product.prodname_desktop %} caches your credentials (username and password or personal access token) and uses the credentials to authenticate for each connection to the remote repository.
1313

14-
{% data variables.product.prodname_desktop %} connects to {% data variables.product.prodname_dotcom %} using HTTPS. If you use {% data variables.product.prodname_desktop %} to access repositories that were cloned using SSH, you may encounter errors. To connect to a repository that was cloned using SSH, change the remote's URLs. For more information, see "[Changing a remote's URL](/github/using-git/changing-a-remotes-url)."
14+
{% data variables.product.prodname_desktop %} connects to {% data variables.product.prodname_dotcom %} using HTTPS. If you use {% data variables.product.prodname_desktop %} to access repositories that were cloned using SSH, you may encounter errors. To connect to a repository that was cloned using SSH, change the remote's URLs. For more information, see "[Managing remote repositories](/github/getting-started-with-github/managing-remote-repositories)."
1515

1616
### Further reading
1717
- "[Cloning and forking repositories from GitHub Desktop](/desktop/contributing-and-collaborating-using-github-desktop/cloning-and-forking-repositories-from-github-desktop)"

content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If you do not wish to create and clone a tutorial repository, you can create a n
4242
- "Description" is an optional field that you can use to provide more information about the purpose of your repository.
4343
- "Local path" sets the location of your repository on your computer. By default, {% data variables.product.prodname_desktop %} creates a _GitHub_ folder inside your _Documents_ folder to store your repositories, but you can choose any location on your computer. Your new repository will be a folder inside the chosen location. For example, if you name your repository `Tutorial`, a folder named _Tutorial_ is created inside the folder you selected for your local path. {% data variables.product.prodname_desktop %} remembers your chosen location the next time you create or clone a new repository.
4444
- **Initialize this repository with a README** creates an initial commit with a _README.md_ file. READMEs helps people understand the purpose of your project, so we recommend selecting this and filling it out with helpful information. When someone visits your repository on {% data variables.product.product_name %}, the README is the first thing they'll see as they learn about your project. For more information, see "[About READMEs](/articles/about-readmes)."
45-
- The **Git ignore** drop-down menu lets you add a custom file to ignore specific files in your local repository that you don't want to store in version control. If there's a specific language or framework that you'll be using, you can select an option from the available list. If you're just getting started, feel free to skip this selection. For more information, see "[Ignoring files](/articles/ignoring-files)."
45+
- The **Git ignore** drop-down menu lets you add a custom file to ignore specific files in your local repository that you don't want to store in version control. If there's a specific language or framework that you'll be using, you can select an option from the available list. If you're just getting started, feel free to skip this selection. For more information, see "[Ignoring files](/github/getting-started-with-github/ignoring-files)."
4646
- The **License** drop-down menu lets you add an open-source license to a _LICENSE_ file in your repository. You don't need to worry about adding a license right away. For more information about available open-source licenses and how to add them to your repository, see "[Licensing a repository](/articles/licensing-a-repository)."
4747
3. Click **Create repository**.
4848

@@ -107,6 +107,6 @@ Now that you've created and published your repository, you're ready to make chan
107107
You've now created a repository, published the repository to {% data variables.product.product_name %}, made a commit, and pushed your changes to {% data variables.product.product_name %}. You can follow this same workflow when contributing to other projects that you create or collaborate on.
108108

109109
### Further reading
110-
- "[Learning about Git](/github/using-git/learning-about-git)"
110+
- "[Getting started with Git](/github/getting-started-with-github/getting-started-with-git)"
111111
- "[Learning about {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/learning-about-github)"
112112
- "[Getting started with {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github)"

content/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This guide will help you get started with {% data variables.product.prodname_des
1313

1414
You might find it helpful to have a basic understanding of Git and {% data variables.product.prodname_dotcom %} before getting started with {% data variables.product.prodname_desktop %}. For more information, see the following articles.
1515

16-
- "[Learning about Git](/github/using-git/learning-about-git)"
16+
- "[Using Git](/github/getting-started-with-github/using-git)"
1717
- "[Learning about {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/learning-about-github)"
1818
- "[Getting started with {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github)"
1919

content/developers/apps/creating-ci-tests-with-the-checks-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ The RuboCop tool [offers](https://docs.rubocop.org/rubocop/usage/basic_usage.htm
724724

725725
To push to a repository, your app must have write permissions for "Repository contents." You set that permission back in [Step 2.2. Cloning the repository](#step-22-cloning-the-repository) to **Read & write**, so you're all set.
726726

727-
In order to commit files, Git must know which [username](/articles/setting-your-username-in-git/) and [email](/articles/setting-your-commit-email-address-in-git/) to associate with the commit. Add two more environment variables in your `.env` file to store the name (`GITHUB_APP_USER_NAME`) and email (`GITHUB_APP_USER_EMAIL`) settings. Your name can be the name of your app and the email can be any email you'd like for this example. For example:
727+
In order to commit files, Git must know which [username](/github/getting-started-with-github/setting-your-username-in-git/) and [email](/articles/setting-your-commit-email-address-in-git/) to associate with the commit. Add two more environment variables in your `.env` file to store the name (`GITHUB_APP_USER_NAME`) and email (`GITHUB_APP_USER_EMAIL`) settings. Your name can be the name of your app and the email can be any email you'd like for this example. For example:
728728

729729
```ini
730730
GITHUB_APP_USER_NAME=Octoapp

content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ After you create your app, you'll be taken back to the [app settings page](https
140140
141141
### Step 4. Prepare the runtime environment
142142
143-
To keep your information secure, we recommend putting all your app-related secrets in your computer's memory where your app can find them, rather than putting them directly in your code. A handy development tool called [dotenv](https://github.com/bkeepers/dotenv) loads project-specific environment variables from a `.env` file to `ENV`. Never check your `.env` file into GitHub. This is a local file that stores sensitive information that you don't want on the public internet. The `.env` file is already included in the repository's [`.gitignore`](/articles/ignoring-files/) file to prevent that.
143+
To keep your information secure, we recommend putting all your app-related secrets in your computer's memory where your app can find them, rather than putting them directly in your code. A handy development tool called [dotenv](https://github.com/bkeepers/dotenv) loads project-specific environment variables from a `.env` file to `ENV`. Never check your `.env` file into GitHub. This is a local file that stores sensitive information that you don't want on the public internet. The `.env` file is already included in the repository's [`.gitignore`](/github/getting-started-with-github/ignoring-files/) file to prevent that.
144144
145145
The template code you downloaded in the [Prerequisites section](#prerequisites) already has an example file called `.env-example`. Rename the example file from `.env-example` to `.env` or create a copy of the `.env-example` file called `.env`. You haven't installed dotenv yet, but you will install it later in this quickstart when you run `bundle install`. **Note:** Quickstarts that reference the steps in this guide may include additional environment variables in the `.env-example` file. Reference the quickstart guide for the project you've cloned on GitHub for guidance setting those additional environment variables.
146146

content/education/manage-coursework-with-github-classroom/create-a-group-assignment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ You can see the teams that are working on or have submitted an assignment in the
132132

133133
### Next steps
134134

135-
- After you create the assignment and your students form teams, team members can start work on the assignment using Git and {% data variables.product.product_name %}'s features. Students can clone the repository, push commits, manage branches, create and review pull requests, address merge conflicts, and discuss changes with issues. Both you and the team can review the commit history for the repository. For more information, see "[Getting started with {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github)," "[Creating, cloning, and archiving repositories](/github/creating-cloning-and-archiving-repositories)," "[Using Git](/github/using-git)," and "[Collaborating with issues and pull requests](/github/collaborating-with-issues-and-pull-requests)," and the free course on [managing merge conflicts](https://lab.github.com/githubtraining/managing-merge-conflicts) from {% data variables.product.prodname_learning %}.
135+
- After you create the assignment and your students form teams, team members can start work on the assignment using Git and {% data variables.product.product_name %}'s features. Students can clone the repository, push commits, manage branches, create and review pull requests, address merge conflicts, and discuss changes with issues. Both you and the team can review the commit history for the repository. For more information, see "[Getting started with {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github)," "[Creating, cloning, and archiving repositories](/github/creating-cloning-and-archiving-repositories)," "[Using Git](/github/getting-started-with-github/using-git)," and "[Collaborating with issues and pull requests](/github/collaborating-with-issues-and-pull-requests)," and the free course on [managing merge conflicts](https://lab.github.com/githubtraining/managing-merge-conflicts) from {% data variables.product.prodname_learning %}.
136136

137137
- When a team finishes an assignment, you can review the files in the repository, or you can review the history and visualizations for the repository to better understand how the team collaborated. For more information, see "[Visualizing repository data with graphs](/github/visualizing-repository-data-with-graphs)."
138138

content/education/manage-coursework-with-github-classroom/create-an-individual-assignment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ You can see whether a student has joined the classroom and accepted or submitted
112112

113113
### Next steps
114114

115-
- Once you create the assignment, students can start work on the assignment using Git and {% data variables.product.product_name %}'s features. Students can clone the repository, push commits, manage branches, create and review pull requests, address merge conflicts, and discuss changes with issues. Both you and student can review the commit history for the repository. For more information, see "[Getting started with {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github)," "[Creating, cloning, and archiving repositories](/github/creating-cloning-and-archiving-repositories)," "[Using Git](/github/using-git)," and "[Collaborating with issues and pull requests](/github/collaborating-with-issues-and-pull-requests)."
115+
- Once you create the assignment, students can start work on the assignment using Git and {% data variables.product.product_name %}'s features. Students can clone the repository, push commits, manage branches, create and review pull requests, address merge conflicts, and discuss changes with issues. Both you and student can review the commit history for the repository. For more information, see "[Getting started with {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github)," "[Creating, cloning, and archiving repositories](/github/creating-cloning-and-archiving-repositories)," "[Using Git](/github/getting-started-with-github/using-git)," and "[Collaborating with issues and pull requests](/github/collaborating-with-issues-and-pull-requests)."
116116

117117
- When a student finishes an assignment, you can review the files in the repository, or you can review the history and visualizations for the repository to better understand the student's work. For more information, see "[Visualizing repository data with graphs](/github/visualizing-repository-data-with-graphs)."
118118

0 commit comments

Comments
 (0)