ran script/content-migrations/remove-map-topics.js && script/content-migrations/update-tocs.js
This commit is contained in:
Sarah Schneider
@@ -8,12 +8,12 @@ redirect_from:
|
||||
- /articles/about-github-mirrors/
|
||||
- /articles/finding-open-source-projects-on-github
|
||||
- /github/getting-started-with-github/finding-open-source-projects-on-github
|
||||
- /github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
topics:
|
||||
- Open Source
|
||||
---
|
||||
|
||||
### Discovering relevant projects
|
||||
|
||||
If there's a particular topic that interests you, visit `github.com/topics/<topic>`. For example, if you are interested in machine learning, you can find relevant projects and good first issues by visiting https://github.com/topics/machine-learning. You can browse popular topics by visiting [Topics](https://github.com/topics). You can also search for repositories that match a topic you're interested in. For more information, see "[Searching for repositories](/articles/searching-for-repositories#search-by-topic)."
|
||||
@@ -3,6 +3,7 @@ title: Following people
|
||||
intro: 'You can follow people on {% data variables.product.product_name %} to receive notifications about their activity{% if currentVersion == "free-pro-team@latest" %} and discover projects in their communities{% endif %}.'
|
||||
redirect_from:
|
||||
- /articles/following-people
|
||||
- /github/getting-started-with-github/following-people
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
@@ -10,7 +11,6 @@ versions:
|
||||
topics:
|
||||
- Profile
|
||||
---
|
||||
|
||||
When you follow people, you'll see their public activity in the activity view of your news feed.{% if currentVersion == "free-pro-team@latest" %} If someone you follow stars a public repository, {% data variables.product.product_name %} may recommend the repository to you in the discovery view of your news feed.{% endif %} To follow someone, visit their profile page and click **Follow** under their profile image.
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
---
|
||||
title: Exploring projects on GitHub
|
||||
intro: ''
|
||||
mapTopic: true
|
||||
redirect_from:
|
||||
- /categories/stars/
|
||||
- /categories/87/articles/
|
||||
@@ -13,5 +12,9 @@ versions:
|
||||
github-ae: '*'
|
||||
topics:
|
||||
- Projects
|
||||
children:
|
||||
- /finding-ways-to-contribute-to-open-source-on-github
|
||||
- /saving-repositories-with-stars
|
||||
- /following-people
|
||||
---
|
||||
|
||||
@@ -7,6 +7,7 @@ redirect_from:
|
||||
- /articles/browsing-friends-stars/
|
||||
- /articles/managing-your-stars/
|
||||
- /articles/saving-repositories-with-stars
|
||||
- /github/getting-started-with-github/saving-repositories-with-stars
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
@@ -14,7 +15,6 @@ versions:
|
||||
topics:
|
||||
- Repositories
|
||||
---
|
||||
|
||||
You can search, sort, and filter your starred repositories and topics on your {% data variables.explore.your_stars_page %}.'
|
||||
|
||||
### About stars
|
||||
@@ -1,15 +0,0 @@
|
||||
---
|
||||
title: Getting started with Git
|
||||
intro: ''
|
||||
mapTopic: true
|
||||
redirect_from:
|
||||
- /articles/getting-started-with-git-and-github
|
||||
- /github/using-git/getting-started-with-git-and-github
|
||||
- /github/using-git/learning-about-git
|
||||
- /articles/learning-about-git
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
@@ -8,13 +8,13 @@ redirect_from:
|
||||
- /articles/which-remote-url-should-i-use
|
||||
- /github/using-git/which-remote-url-should-i-use
|
||||
- /github/using-git/about-remote-repositories
|
||||
- /github/getting-started-with-github/about-remote-repositories
|
||||
intro: 'GitHub''s collaborative approach to development depends on publishing commits from your local repository to {% data variables.product.product_name %} for other people to view, fetch, and update.'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
### About remote repositories
|
||||
|
||||
A remote URL is Git's fancy way of saying "the place where your code is stored." That URL could be your repository on GitHub, or another user's fork, or even on a completely different server.
|
||||
@@ -7,12 +7,12 @@ redirect_from:
|
||||
- /articles/using-sublime-text-2-as-your-default-editor/
|
||||
- /articles/associating-text-editors-with-git
|
||||
- /github/using-git/associating-text-editors-with-git
|
||||
- /github/getting-started-with-github/associating-text-editors-with-git
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
{% mac %}
|
||||
|
||||
### Using Atom as your editor
|
||||
@@ -5,13 +5,13 @@ redirect_from:
|
||||
- /articles/caching-your-github-password-in-git
|
||||
- /github/using-git/caching-your-github-password-in-git
|
||||
- /github/using-git/caching-your-github-credentials-in-git
|
||||
- /github/getting-started-with-github/caching-your-github-credentials-in-git
|
||||
intro: 'If you''re [cloning {% data variables.product.product_name %} repositories using HTTPS](/github/getting-started-with-github/about-remote-repositories), you can use a credential helper to tell Git to remember your credentials.'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
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 %}
|
||||
@@ -7,12 +7,12 @@ redirect_from:
|
||||
- /articles/dealing-with-line-endings/
|
||||
- /articles/configuring-git-to-handle-line-endings
|
||||
- /github/using-git/configuring-git-to-handle-line-endings
|
||||
- /github/getting-started-with-github/configuring-git-to-handle-line-endings
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
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 {% 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 macOS.
|
||||
@@ -5,6 +5,7 @@ redirect_from:
|
||||
- /articles/what-is-a-good-git-workflow/
|
||||
- /articles/git-workflows
|
||||
- /github/using-git/git-workflows
|
||||
- /github/getting-started-with-github/git-workflows
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
@@ -5,13 +5,13 @@ redirect_from:
|
||||
- /ignore-files/
|
||||
- /articles/ignoring-files
|
||||
- /github/using-git/ignoring-files
|
||||
- /github/getting-started-with-github/ignoring-files
|
||||
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: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
### Configuring ignored files for a single repository
|
||||
|
||||
You can create a *.gitignore* file in your repository's root directory to tell Git which files and directories to ignore when you make a commit.
|
||||
@@ -0,0 +1,25 @@
|
||||
---
|
||||
title: Getting started with Git
|
||||
intro: ''
|
||||
redirect_from:
|
||||
- /articles/getting-started-with-git-and-github
|
||||
- /github/using-git/getting-started-with-git-and-github
|
||||
- /github/using-git/learning-about-git
|
||||
- /articles/learning-about-git
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
children:
|
||||
- /setting-your-username-in-git
|
||||
- /caching-your-github-credentials-in-git
|
||||
- /why-is-git-always-asking-for-my-password
|
||||
- /updating-credentials-from-the-macos-keychain
|
||||
- /git-workflows
|
||||
- /about-remote-repositories
|
||||
- /managing-remote-repositories
|
||||
- /associating-text-editors-with-git
|
||||
- /configuring-git-to-handle-line-endings
|
||||
- /ignoring-files
|
||||
---
|
||||
|
||||
@@ -16,12 +16,12 @@ redirect_from:
|
||||
- /articles/removing-a-remote
|
||||
- /github/using-git/removing-a-remote
|
||||
- /github/using-git/managing-remote-repositories
|
||||
- /github/getting-started-with-github/managing-remote-repositories
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
### Adding a remote repository
|
||||
|
||||
To add a new remote, use the `git remote add` command on the terminal, in the directory your repository is stored at.
|
||||
@@ -4,12 +4,12 @@ intro: 'Git uses a username to associate commits with an identity. The Git usern
|
||||
redirect_from:
|
||||
- /articles/setting-your-username-in-git
|
||||
- /github/using-git/setting-your-username-in-git
|
||||
- /github/getting-started-with-github/setting-your-username-in-git
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
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.
|
||||
@@ -5,12 +5,12 @@ redirect_from:
|
||||
- /articles/updating-credentials-from-the-osx-keychain
|
||||
- /github/using-git/updating-credentials-from-the-osx-keychain
|
||||
- /github/using-git/updating-credentials-from-the-macos-keychain
|
||||
- /github/getting-started-with-github/updating-credentials-from-the-macos-keychain
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
{% data reusables.user_settings.password-authentication-deprecation %}
|
||||
|
||||
### Updating your credentials via Keychain Access
|
||||
@@ -4,12 +4,12 @@ intro: 'If Git prompts you for a username and password every time you try to int
|
||||
redirect_from:
|
||||
- /articles/why-is-git-always-asking-for-my-password
|
||||
- /github/using-git/why-is-git-always-asking-for-my-password
|
||||
- /github/getting-started-with-github/why-is-git-always-asking-for-my-password
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
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 {% data variables.product.product_name %} credentials every time you pull or push a repository.
|
||||
|
||||
{% data reusables.user_settings.password-authentication-deprecation %}
|
||||
@@ -42,75 +42,13 @@ topics:
|
||||
- Issues
|
||||
- Notifications
|
||||
- Accounts
|
||||
children:
|
||||
- /quickstart
|
||||
- /learning-about-github
|
||||
- /signing-up-for-github
|
||||
- /using-github
|
||||
- /exploring-projects-on-github
|
||||
- /getting-started-with-git
|
||||
- /using-git
|
||||
---
|
||||
|
||||
<div hidden>
|
||||
|
||||
<!-- {% link_with_intro /quickstart %} -->
|
||||
<!-- {% link_with_intro /learning-about-github %} -->
|
||||
<!-- {% link_with_intro /signing-up-for-github %} -->
|
||||
<!-- {% link_with_intro /exploring-projects-on-github %} -->
|
||||
<!-- {% link_with_intro /using-github %} -->
|
||||
|
||||
### Table of Contents
|
||||
|
||||
{% topic_link_in_list /quickstart %}
|
||||
{% link_in_list /set-up-git %}
|
||||
{% link_in_list /create-a-repo %}
|
||||
{% link_in_list /fork-a-repo %}
|
||||
{% link_in_list /github-flow %}
|
||||
{% link_in_list /be-social %}
|
||||
{% link_in_list /github-glossary %}
|
||||
{% link_in_list /git-cheatsheet %}
|
||||
{% link_in_list /git-and-github-learning-resources %}
|
||||
|
||||
{% topic_link_in_list /learning-about-github %}
|
||||
{% link_in_list /githubs-products %}
|
||||
{% link_in_list /github-language-support %}
|
||||
{% link_in_list /about-github-advanced-security %}
|
||||
{% link_in_list /types-of-github-accounts %}
|
||||
{% link_in_list /access-permissions-on-github %}
|
||||
{% link_in_list /faq-about-changes-to-githubs-plans %}
|
||||
|
||||
{% topic_link_in_list /signing-up-for-github %}
|
||||
{% link_in_list /signing-up-for-a-new-github-account %}
|
||||
{% link_in_list /verifying-your-email-address %}
|
||||
{% link_in_list /setting-up-a-trial-of-github-enterprise-cloud %}
|
||||
{% link_in_list /setting-up-a-trial-of-github-enterprise-server %}
|
||||
|
||||
{% topic_link_in_list /using-github %}
|
||||
{% link_in_list /exploring-early-access-releases-with-feature-preview %}
|
||||
{% link_in_list /supported-browsers %}
|
||||
{% link_in_list /github-cli %}
|
||||
{% link_in_list /github-desktop %}
|
||||
{% link_in_list /github-for-mobile %}
|
||||
{% link_in_list /keyboard-shortcuts %}
|
||||
{% link_in_list /troubleshooting-connectivity-problems %}
|
||||
|
||||
{% topic_link_in_list /exploring-projects-on-github %}
|
||||
{% link_in_list /finding-ways-to-contribute-to-open-source-on-github %}
|
||||
{% link_in_list /saving-repositories-with-stars %}
|
||||
{% link_in_list /following-people %}
|
||||
|
||||
{% topic_link_in_list /getting-started-with-git %}
|
||||
{% link_in_list /setting-your-username-in-git %}
|
||||
{% link_in_list /caching-your-github-credentials-in-git %}
|
||||
{% link_in_list /why-is-git-always-asking-for-my-password %}
|
||||
{% link_in_list /updating-credentials-from-the-macos-keychain %}
|
||||
{% link_in_list /git-workflows %}
|
||||
{% link_in_list /about-remote-repositories %}
|
||||
{% link_in_list /managing-remote-repositories %}
|
||||
{% link_in_list /associating-text-editors-with-git %}
|
||||
{% link_in_list /configuring-git-to-handle-line-endings %}
|
||||
{% link_in_list /ignoring-files %}
|
||||
|
||||
{% topic_link_in_list /using-git %}
|
||||
{% link_in_list /pushing-commits-to-a-remote-repository %}
|
||||
{% link_in_list /getting-changes-from-a-remote-repository %}
|
||||
{% link_in_list /dealing-with-non-fast-forward-errors %}
|
||||
{% link_in_list /splitting-a-subfolder-out-into-a-new-repository %}
|
||||
{% link_in_list /about-git-subtree-merges %}
|
||||
{% link_in_list /about-git-rebase %}
|
||||
{% link_in_list /using-git-rebase-on-the-command-line %}
|
||||
{% link_in_list /resolving-merge-conflicts-after-a-git-rebase %}
|
||||
</div>
|
||||
|
||||
@@ -8,8 +8,9 @@ versions:
|
||||
github-ae: '*'
|
||||
topics:
|
||||
- Security
|
||||
redirect_from:
|
||||
- /github/getting-started-with-github/about-github-advanced-security
|
||||
---
|
||||
|
||||
### About {% data variables.product.prodname_GH_advanced_security %}
|
||||
|
||||
{% data variables.product.prodname_dotcom %} has many features that help you improve and maintain the quality of your code. Some of these are included in all plans{% if currentVersion != "github-ae@latest" %}, such as dependency graph and {% data variables.product.prodname_dependabot_alerts %}{% endif %}. Other security features require a license for {% data variables.product.prodname_GH_advanced_security %} to run on repositories apart from public repositories on {% data variables.product.prodname_dotcom_the_website %}.
|
||||
@@ -5,6 +5,7 @@ redirect_from:
|
||||
- /articles/what-are-the-different-types-of-team-permissions/
|
||||
- /articles/what-are-the-different-access-permissions/
|
||||
- /articles/access-permissions-on-github
|
||||
- /github/getting-started-with-github/access-permissions-on-github
|
||||
intro: 'While you can grant read/write access to collaborators on a personal repository, members of an organization can have more granular access permissions for the organization''s repositories.'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
@@ -14,7 +15,6 @@ topics:
|
||||
- Permissions
|
||||
- Accounts
|
||||
---
|
||||
|
||||
### Personal user accounts
|
||||
|
||||
A repository owned by a user account has two permission levels: the *repository owner* and *collaborators*. For more information, see "[Permission levels for a user account repository](/articles/permission-levels-for-a-user-account-repository)."
|
||||
@@ -5,8 +5,9 @@ versions:
|
||||
free-pro-team: '*'
|
||||
topics:
|
||||
- GitHub
|
||||
redirect_from:
|
||||
- /github/getting-started-with-github/faq-about-changes-to-githubs-plans
|
||||
---
|
||||
|
||||
### What plans and pricing changes did GitHub announce on April 14?
|
||||
|
||||
GitHub announced the following plans and pricing changes:
|
||||
@@ -7,6 +7,8 @@ versions:
|
||||
github-ae: '*'
|
||||
topics:
|
||||
- GitHub
|
||||
redirect_from:
|
||||
- /github/getting-started-with-github/github-language-support
|
||||
---
|
||||
<!-- If you make changes to this article, also update any feature-level articles to reflect the same changes in language support. -->
|
||||
|
||||
@@ -4,6 +4,7 @@ intro: 'An overview of {% data variables.product.prodname_dotcom %}''s products
|
||||
redirect_from:
|
||||
- /articles/github-s-products
|
||||
- /articles/githubs-products
|
||||
- /github/getting-started-with-github/githubs-products
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
@@ -15,7 +16,6 @@ topics:
|
||||
- Desktop
|
||||
- Security
|
||||
---
|
||||
|
||||
### About {% data variables.product.prodname_dotcom %}'s products
|
||||
|
||||
{% data variables.product.prodname_dotcom %} offers free and paid products. You can see pricing and a full list of features for each product at <{% data variables.product.pricing_url %}>. {% data reusables.products.product-roadmap %}
|
||||
@@ -1,7 +1,6 @@
|
||||
---
|
||||
title: Learning about GitHub
|
||||
intro: '{% data variables.product.prodname_dotcom %} has a variety of products and account types to help you build software and collaborate with other people.'
|
||||
mapTopic: true
|
||||
redirect_from:
|
||||
- /articles/learning-about-github
|
||||
versions:
|
||||
@@ -14,5 +13,12 @@ topics:
|
||||
- Mobile
|
||||
- Desktop
|
||||
- Security
|
||||
children:
|
||||
- /githubs-products
|
||||
- /github-language-support
|
||||
- /about-github-advanced-security
|
||||
- /types-of-github-accounts
|
||||
- /access-permissions-on-github
|
||||
- /faq-about-changes-to-githubs-plans
|
||||
---
|
||||
|
||||
@@ -7,6 +7,7 @@ redirect_from:
|
||||
- /articles/what-s-the-difference-between-user-and-organization-accounts/
|
||||
- /articles/differences-between-user-and-organization-accounts/
|
||||
- /articles/types-of-github-accounts
|
||||
- /github/getting-started-with-github/types-of-github-accounts
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
@@ -18,7 +19,6 @@ topics:
|
||||
- Desktop
|
||||
- Security
|
||||
---
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}
|
||||
For a full list of features for each {% data variables.product.product_name %} product, see "[{% data variables.product.prodname_dotcom %}'s products](/github/getting-started-with-github/githubs-products)."
|
||||
{% endif %}
|
||||
@@ -3,6 +3,7 @@ title: Be social
|
||||
redirect_from:
|
||||
- /be-social/
|
||||
- /articles/be-social
|
||||
- /github/getting-started-with-github/be-social
|
||||
intro: 'You can interact with people, repositories, and organizations on {% data variables.product.prodname_dotcom %}. See what others are working on and who they''re connecting with from your personal dashboard.'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
@@ -15,7 +16,6 @@ topics:
|
||||
- Notifications
|
||||
- Accounts
|
||||
---
|
||||
|
||||
To learn about accessing your personal dashboard, see "[About your personal dashboard](/articles/about-your-personal-dashboard)."
|
||||
|
||||
### Following people
|
||||
@@ -3,6 +3,7 @@ title: Create a repo
|
||||
redirect_from:
|
||||
- /create-a-repo/
|
||||
- /articles/create-a-repo
|
||||
- /github/getting-started-with-github/create-a-repo
|
||||
intro: 'To put your project up on {% data variables.product.product_location %}, you''ll need to create a repository for it to live in.'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
@@ -14,7 +15,6 @@ topics:
|
||||
- Notifications
|
||||
- Accounts
|
||||
---
|
||||
|
||||
### Create a repository
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}
|
||||
@@ -4,6 +4,7 @@ redirect_from:
|
||||
- /fork-a-repo/
|
||||
- /forking/
|
||||
- /articles/fork-a-repo
|
||||
- /github/getting-started-with-github/fork-a-repo
|
||||
intro: A fork is a copy of a repository. Forking a repository allows you to freely experiment with changes without affecting the original project.
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
@@ -15,7 +16,6 @@ topics:
|
||||
- Notifications
|
||||
- Accounts
|
||||
---
|
||||
|
||||
### About forks
|
||||
|
||||
Most commonly, forks are used to either propose changes to someone else's project or to use someone else's project as a starting point for your own idea.
|
||||
@@ -4,6 +4,7 @@ redirect_from:
|
||||
- /articles/good-resources-for-learning-git-and-github/
|
||||
- /articles/what-are-other-good-resources-for-learning-git-and-github/
|
||||
- /articles/git-and-github-learning-resources
|
||||
- /github/getting-started-with-github/git-and-github-learning-resources
|
||||
intro: 'There are a lot of helpful Git and {% data variables.product.product_name %} resources on the web. This is a short list of our favorites!'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
@@ -12,7 +13,6 @@ versions:
|
||||
authors:
|
||||
- GitHub
|
||||
---
|
||||
|
||||
### Using Git
|
||||
|
||||
Familiarize yourself with Git by visiting the [official Git project site](https://git-scm.com) and reading the [ProGit book](http://git-scm.com/book). You can review the [Git command list](https://git-scm.com/docs) or [Git command lookup reference](http://gitref.org) while using the [Try Git](https://try.github.com) simulator.
|
||||
@@ -2,11 +2,12 @@
|
||||
title: Git cheatsheet
|
||||
redirect_from:
|
||||
- /articles/git-cheatsheet
|
||||
- /github/getting-started-with-github/git-cheatsheet
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
intro: This Git cheat sheet is a time saver when you forget a command or don't want to use help in the CLI.
|
||||
intro: This Git cheat sheet is a time saver when you forget a command or don't want to use help in the CLI.
|
||||
---
|
||||
Learning all available Git commands at once can be a daunting task. You can use "[Git Cheat Sheets](https://training.github.com/)" for a quick reference to frequently used commands. The "Using Git" cheat sheet is available in several languages.
|
||||
|
||||
@@ -6,6 +6,7 @@ redirect_from:
|
||||
- /articles/github-flow-in-the-browser/
|
||||
- /articles/github-flow
|
||||
- /github/collaborating-with-issues-and-pull-requests/github-flow
|
||||
- /github/getting-started-with-github/github-flow
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
@@ -15,7 +16,6 @@ topics:
|
||||
- Fundamentals
|
||||
miniTocMaxHeadingLevel: 4
|
||||
---
|
||||
|
||||
### Introduction
|
||||
|
||||
{% data variables.product.prodname_dotcom %} flow is a lightweight, branch-based workflow. The {% data variables.product.prodname_dotcom %} flow is useful for everyone, not just developers. For example, here at {% data variables.product.prodname_dotcom %}, we use {% data variables.product.prodname_dotcom %} flow for our [site policy](https://github.com/github/site-policy), [documentation](https://github.com/github/docs), and [roadmap](https://github.com/github/roadmap).
|
||||
@@ -3,12 +3,12 @@ title: GitHub glossary
|
||||
intro: 'Below are a list of some Git and {% data variables.product.prodname_dotcom %} specific terms we use across our sites and documentation.'
|
||||
redirect_from:
|
||||
- /articles/github-glossary
|
||||
- /github/getting-started-with-github/github-glossary
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
{% for term in site.data.glossaries.external %}
|
||||
### {% data glossaries.external[forloop.index0].term %}
|
||||
{% data glossaries.external[forloop.index0].description %}
|
||||
@@ -1,7 +1,6 @@
|
||||
---
|
||||
title: Quickstart
|
||||
intro: 'Quickly get started with common tasks on {% data variables.product.prodname_dotcom %}.'
|
||||
mapTopic: true
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
@@ -11,5 +10,14 @@ topics:
|
||||
- Issues
|
||||
- Notifications
|
||||
- Accounts
|
||||
children:
|
||||
- /set-up-git
|
||||
- /create-a-repo
|
||||
- /fork-a-repo
|
||||
- /github-flow
|
||||
- /be-social
|
||||
- /github-glossary
|
||||
- /git-cheatsheet
|
||||
- /git-and-github-learning-resources
|
||||
---
|
||||
|
||||
@@ -10,6 +10,7 @@ redirect_from:
|
||||
- /win-git-installation/
|
||||
- /win-set-up-git/
|
||||
- /articles/set-up-git
|
||||
- /github/getting-started-with-github/set-up-git
|
||||
intro: 'At the heart of {% data variables.product.product_name %} is an open source version control system (VCS) called Git. Git is responsible for everything {% data variables.product.product_name %}-related that happens locally on your computer.'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
@@ -21,7 +22,6 @@ topics:
|
||||
- Notifications
|
||||
- Accounts
|
||||
---
|
||||
|
||||
### Using Git
|
||||
|
||||
To use Git on the command line, you'll need to download, install, and configure Git on your computer. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} You can also install {% data variables.product.prodname_cli %} to use {% data variables.product.product_name %} from the command line. For more information on {% data variables.product.prodname_cli %}, see the [{% data variables.product.prodname_cli %}](https://cli.github.com/manual/) documentation.{% endif %}
|
||||
@@ -1,7 +1,6 @@
|
||||
---
|
||||
title: Signing up for GitHub
|
||||
intro: ''
|
||||
mapTopic: true
|
||||
redirect_from:
|
||||
- /articles/signing-up-for-github
|
||||
versions:
|
||||
@@ -10,5 +9,10 @@ versions:
|
||||
github-ae: '*'
|
||||
topics:
|
||||
- Accounts
|
||||
children:
|
||||
- /signing-up-for-a-new-github-account
|
||||
- /verifying-your-email-address
|
||||
- /setting-up-a-trial-of-github-enterprise-cloud
|
||||
- /setting-up-a-trial-of-github-enterprise-server
|
||||
---
|
||||
|
||||
@@ -3,13 +3,13 @@ title: Setting up a trial of GitHub Enterprise Cloud
|
||||
intro: 'You can try {% data variables.product.prodname_ghe_cloud %} for free.'
|
||||
redirect_from:
|
||||
- /articles/setting-up-a-trial-of-github-enterprise-cloud
|
||||
- /github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-cloud
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
topics:
|
||||
- Accounts
|
||||
---
|
||||
|
||||
### About trials of {% data variables.product.prodname_ghe_cloud %}
|
||||
|
||||
You can set up a 14-day trial to evaluate {% data variables.product.prodname_ghe_cloud %} on a new organization account. You do not need to provide a payment method during the trial unless you add {% data variables.product.prodname_marketplace %} apps to your organization that require a payment method. For more information, see "<a href="/articles/about-billing-for-github-marketplace/" class="dotcom-only">About billing for {% data variables.product.prodname_marketplace %}</a>."
|
||||
@@ -4,13 +4,13 @@ intro: 'You can try {% data variables.product.prodname_ghe_server %} for free.'
|
||||
redirect_from:
|
||||
- /articles/requesting-a-trial-of-github-enterprise/
|
||||
- /articles/setting-up-a-trial-of-github-enterprise-server
|
||||
- /github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
topics:
|
||||
- Accounts
|
||||
---
|
||||
|
||||
### About trials of {% data variables.product.prodname_ghe_server %}
|
||||
|
||||
You can request a 45-day trial to evaluate {% data variables.product.prodname_ghe_server %}. Your trial will be installed as a virtual appliance, with options for on-premises or cloud deployment. For a list of supported visualization platforms, see "[Setting up a GitHub Enterprise Server instance](/enterprise/admin/installation/setting-up-a-github-enterprise-server-instance)."
|
||||
@@ -4,12 +4,12 @@ shortTitle: Sign up for a new GitHub account
|
||||
intro: '{% data variables.product.product_name %} offers user accounts for individuals and organizations for teams of people working together.'
|
||||
redirect_from:
|
||||
- /articles/signing-up-for-a-new-github-account
|
||||
- /github/getting-started-with-github/signing-up-for-a-new-github-account
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
topics:
|
||||
- Accounts
|
||||
---
|
||||
|
||||
For more information about account types and products, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/articles/types-of-github-accounts)" and "[{% data variables.product.product_name %}'s products](/articles/github-s-products)."
|
||||
|
||||
{% data reusables.accounts.create-account %}
|
||||
@@ -5,12 +5,12 @@ redirect_from:
|
||||
- /articles/troubleshooting-email-verification/
|
||||
- /articles/setting-up-email-verification/
|
||||
- /articles/verifying-your-email-address
|
||||
- /github/getting-started-with-github/verifying-your-email-address
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
topics:
|
||||
- Accounts
|
||||
---
|
||||
|
||||
### About email verification
|
||||
|
||||
You can verify your email address after signing up for a new account, or when you add a new email address. If an email address is undeliverable or bouncing, it will be unverified.
|
||||
@@ -5,15 +5,13 @@ redirect_from:
|
||||
- articles/interactive-rebase/
|
||||
- /articles/about-git-rebase
|
||||
- /github/using-git/about-git-rebase
|
||||
- /github/getting-started-with-github/about-git-rebase
|
||||
intro: 'The `git rebase` command allows you to easily change a series of commits, modifying the history of your repository. You can reorder, edit, or squash commits together.'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
|
||||
|
||||
Typically, you would use `git rebase` to:
|
||||
|
||||
* Edit previous commit messages
|
||||
@@ -5,13 +5,13 @@ redirect_from:
|
||||
- /subtree-merge/
|
||||
- /articles/about-git-subtree-merges
|
||||
- /github/using-git/about-git-subtree-merges
|
||||
- /github/getting-started-with-github/about-git-subtree-merges
|
||||
intro: 'If you need to manage multiple projects within a single repository, you can use a *subtree merge* to handle all the references.'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
### About subtree merges
|
||||
|
||||
Typically, a subtree merge is used to contain a repository within a repository. The "subrepository" is stored in a folder of the main repository.
|
||||
@@ -4,12 +4,12 @@ intro: 'Sometimes, Git can''t make your change to a remote repository without lo
|
||||
redirect_from:
|
||||
- /articles/dealing-with-non-fast-forward-errors
|
||||
- /github/using-git/dealing-with-non-fast-forward-errors
|
||||
- /github/getting-started-with-github/dealing-with-non-fast-forward-errors
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
If another person has pushed to the same branch as you, Git won't be able to push your changes:
|
||||
|
||||
```shell
|
||||
@@ -5,6 +5,7 @@ redirect_from:
|
||||
- /articles/fetching-a-remote/
|
||||
- /articles/getting-changes-from-a-remote-repository
|
||||
- /github/using-git/getting-changes-from-a-remote-repository
|
||||
- /github/getting-started-with-github/getting-changes-from-a-remote-repository
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
@@ -1,7 +1,6 @@
|
||||
---
|
||||
title: Using Git
|
||||
intro: ''
|
||||
mapTopic: true
|
||||
redirect_from:
|
||||
- /articles/using-common-git-commands
|
||||
- /github/using-git/using-common-git-commands
|
||||
@@ -14,4 +13,14 @@ versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
children:
|
||||
- /pushing-commits-to-a-remote-repository
|
||||
- /getting-changes-from-a-remote-repository
|
||||
- /dealing-with-non-fast-forward-errors
|
||||
- /splitting-a-subfolder-out-into-a-new-repository
|
||||
- /about-git-subtree-merges
|
||||
- /about-git-rebase
|
||||
- /using-git-rebase-on-the-command-line
|
||||
- /resolving-merge-conflicts-after-a-git-rebase
|
||||
---
|
||||
|
||||
@@ -5,12 +5,12 @@ redirect_from:
|
||||
- /articles/pushing-to-a-remote/
|
||||
- /articles/pushing-commits-to-a-remote-repository
|
||||
- /github/using-git/pushing-commits-to-a-remote-repository
|
||||
- /github/getting-started-with-github/pushing-commits-to-a-remote-repository
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
The `git push` command takes two arguments:
|
||||
|
||||
* A remote name, for example, `origin`
|
||||
@@ -4,13 +4,12 @@ intro: 'When you perform a `git rebase` operation, you''re typically moving comm
|
||||
redirect_from:
|
||||
- /articles/resolving-merge-conflicts-after-a-git-rebase
|
||||
- /github/using-git/resolving-merge-conflicts-after-a-git-rebase
|
||||
- /github/getting-started-with-github/resolving-merge-conflicts-after-a-git-rebase
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
|
||||
After you reorder and manipulate commits using `git rebase`, should a merge conflict occur, Git will tell you so with the following message printed to the terminal:
|
||||
|
||||
```shell
|
||||
@@ -4,13 +4,13 @@ redirect_from:
|
||||
- /articles/splitting-a-subpath-out-into-a-new-repository/
|
||||
- /articles/splitting-a-subfolder-out-into-a-new-repository
|
||||
- /github/using-git/splitting-a-subfolder-out-into-a-new-repository
|
||||
- /github/getting-started-with-github/splitting-a-subfolder-out-into-a-new-repository
|
||||
intro: You can turn a folder within a Git repository into a brand new repository.
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
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.
|
||||
|
||||
{% data reusables.command_line.open_the_multi_os_terminal %}
|
||||
@@ -4,13 +4,13 @@ redirect_from:
|
||||
- /articles/using-git-rebase/
|
||||
- /articles/using-git-rebase-on-the-command-line
|
||||
- /github/using-git/using-git-rebase-on-the-command-line
|
||||
- /github/getting-started-with-github/using-git-rebase-on-the-command-line
|
||||
intro: Here's a short tutorial on using `git rebase` on the command line.
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
### Using Git rebase
|
||||
|
||||
In this example, we will cover all of the `git rebase` commands available, except for `exec`.
|
||||
@@ -1,12 +0,0 @@
|
||||
---
|
||||
title: Using GitHub
|
||||
intro: ''
|
||||
mapTopic: true
|
||||
redirect_from:
|
||||
- /articles/using-github
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
@@ -3,12 +3,12 @@ title: Exploring early access releases with feature preview
|
||||
intro: You can use feature preview to see products or features that are available in beta and to enable or disable each feature for your user account.
|
||||
redirect_from:
|
||||
- /articles/exploring-early-access-releases-with-feature-preview
|
||||
- /github/getting-started-with-github/exploring-early-access-releases-with-feature-preview
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
topics:
|
||||
- Early access
|
||||
---
|
||||
|
||||
### {% data variables.product.prodname_dotcom %}'s release cycle
|
||||
|
||||
{% data variables.product.product_name %}'s products and features can go through multiple release phases.
|
||||
@@ -7,8 +7,9 @@ versions:
|
||||
github-ae: '*'
|
||||
topics:
|
||||
- CLI
|
||||
redirect_from:
|
||||
- /github/getting-started-with-github/github-cli
|
||||
---
|
||||
|
||||
### About {% data variables.product.prodname_cli %}
|
||||
|
||||
{% data variables.product.prodname_cli %} is an open source tool for using {% data variables.product.product_name %} from your computer's command line. When you're working from the command line, you can use the {% data variables.product.prodname_cli %} to save time and avoid switching context.
|
||||
@@ -7,8 +7,9 @@ versions:
|
||||
github-ae: '*'
|
||||
topics:
|
||||
- Desktop
|
||||
redirect_from:
|
||||
- /github/getting-started-with-github/github-desktop
|
||||
---
|
||||
|
||||
### About {% data variables.product.prodname_desktop %}
|
||||
|
||||
{% data reusables.desktop.about-github-desktop %}
|
||||
@@ -6,8 +6,9 @@ versions:
|
||||
enterprise-server: '>=3.0'
|
||||
topics:
|
||||
- Mobile
|
||||
redirect_from:
|
||||
- /github/getting-started-with-github/github-for-mobile
|
||||
---
|
||||
|
||||
{% data reusables.mobile.ghes-release-phase %}
|
||||
|
||||
### About {% data variables.product.prodname_mobile %}
|
||||
@@ -0,0 +1,19 @@
|
||||
---
|
||||
title: Using GitHub
|
||||
intro: ''
|
||||
redirect_from:
|
||||
- /articles/using-github
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
children:
|
||||
- /exploring-early-access-releases-with-feature-preview
|
||||
- /supported-browsers
|
||||
- /github-cli
|
||||
- /github-desktop
|
||||
- /github-for-mobile
|
||||
- /keyboard-shortcuts
|
||||
- /troubleshooting-connectivity-problems
|
||||
---
|
||||
|
||||
@@ -6,13 +6,12 @@ redirect_from:
|
||||
- /categories/75/articles/
|
||||
- /categories/keyboard-shortcuts/
|
||||
- /articles/keyboard-shortcuts
|
||||
- /github/getting-started-with-github/keyboard-shortcuts
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
|
||||
### About keyboard shortcuts
|
||||
|
||||
Typing <kbd>?</kbd> in {% data variables.product.product_name %} brings up a dialog box that lists the keyboard shortcuts available for that page. You can use these keyboard shortcuts to perform actions across the site without using your mouse to navigate.
|
||||
@@ -4,13 +4,13 @@ redirect_from:
|
||||
- /articles/why-doesn-t-graphs-work-with-ie-8/
|
||||
- /articles/why-don-t-graphs-work-with-ie8/
|
||||
- /articles/supported-browsers
|
||||
- /github/getting-started-with-github/supported-browsers
|
||||
intro: 'We design {% data variables.product.product_name %} to support the latest web browsers. We support the current versions of [Chrome](https://www.google.com/chrome/), [Firefox](http://www.mozilla.org/firefox/), [Safari](http://www.apple.com/safari/), and [Microsoft Edge](https://www.microsoft.com/en-us/windows/microsoft-edge).'
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
github-ae: '*'
|
||||
---
|
||||
|
||||
### Firefox Extended Support Release
|
||||
|
||||
We do our best to support Firefox's latest [Extended Support Release](https://www.mozilla.org/en-US/firefox/organizations/) (ESR). Older versions of Firefox may disable some features on {% data variables.product.product_name %} and require the latest version of Firefox.
|
||||
@@ -3,11 +3,10 @@ title: Troubleshooting connectivity problems
|
||||
intro: 'If you''re having trouble connecting to {% data variables.product.prodname_dotcom %}, you can troubleshoot your connection, then use the {% data variables.product.prodname_debug %} tool to diagnose problems.'
|
||||
redirect_from:
|
||||
- /articles/troubleshooting-connectivity-problems
|
||||
- /github/getting-started-with-github/troubleshooting-connectivity-problems
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
---
|
||||
|
||||
|
||||
Most often, connection problems occur because a firewall, proxy server, corporate network, or other network is configured in a way that blocks {% data variables.product.prodname_dotcom %}.
|
||||
|
||||
### Allowing {% data variables.product.prodname_dotcom %}'s IP addresses
|
||||
Reference in New Issue
Block a user