GitHub AE (GHAE) (#16090)

content/github/using-git/about-git-rebase.md

@@ -8,6 +8,7 @@ intro: 'The `git rebase` command allows you to easily change a series of commits
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 

content/github/using-git/about-git-subtree-merges.md

@@ -8,6 +8,7 @@ intro: 'If you need to manage multiple projects within a single repository, you
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 Typically, a subtree merge is used to contain a repository within a repository. The "subrepository" is stored in a folder of the main repository.

content/github/using-git/about-remote-repositories.md

@@ -8,6 +8,7 @@ intro: 'GitHub''s collaborative approach to development depends on publishing co
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 A remote URL is Git's fancy way of saying "the place where your code is stored."

content/github/using-git/adding-a-remote.md

@@ -6,6 +6,7 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 The `git remote add` command takes two arguments:

content/github/using-git/associating-text-editors-with-git.md

@@ -9,6 +9,7 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 {% mac %}

content/github/using-git/caching-your-github-credentials-in-git.md

@@ -8,6 +8,7 @@ intro: 'If you''re [cloning {% data variables.product.product_name %} repositori
 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)."

content/github/using-git/changing-a-remotes-url.md

@@ -7,6 +7,7 @@ intro: The `git remote set-url` command changes an existing remote repository UR
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 {% tip %}
@@ -52,8 +53,7 @@ git@{% data variables.command_line.codeblock %}:<em>USERNAME</em>/<em>REPOSITORY
 
 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. {% data reusables.user_settings.password-authentication-deprecation %}
 
-- If you have [two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) enabled, you must [create a personal access token](/github/authenticating-to-github/creating-a-personal-access-token) to use instead of your GitHub password.
-- You can [use a credential helper](/github/using-git/caching-your-github-credentials-in-git) so Git will remember your GitHub username and password every time it talks to GitHub.
+You can [use a credential helper](/github/using-git/caching-your-github-credentials-in-git) so Git will remember your GitHub username and personal access token every time it talks to GitHub.
 
 ### Switching remote URLs from HTTPS to SSH
 

content/github/using-git/configuring-git-to-handle-line-endings.md

@@ -9,6 +9,7 @@ redirect_from:
 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.

content/github/using-git/dealing-with-non-fast-forward-errors.md

@@ -6,6 +6,7 @@ redirect_from:
 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:

content/github/using-git/getting-changes-from-a-remote-repository.md

@@ -7,6 +7,7 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 These commands are very useful when interacting with [a remote repository](/articles/about-remote-repositories). `clone` and `fetch` download remote code from a repository's remote URL to your local computer, `merge` is used to merge different people's work together with yours, and `pull` is a combination of `fetch` and `merge`.
 

content/github/using-git/getting-started-with-git-and-github.md

@@ -7,5 +7,6 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 

content/github/using-git/git-workflows.md

@@ -7,5 +7,6 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 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.

content/github/using-git/ignoring-files.md

@@ -8,6 +8,7 @@ intro: 'You can configure Git to ignore files you don''t want to check in to {%
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 ### Configuring ignored files for a single repository

content/github/using-git/index.md

@@ -7,6 +7,7 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 

content/github/using-git/learning-about-git.md

@@ -7,5 +7,6 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 

content/github/using-git/managing-remote-repositories.md

@@ -10,5 +10,6 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 

content/github/using-git/pushing-commits-to-a-remote-repository.md

@@ -7,6 +7,7 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 The `git push` command takes two arguments:

content/github/using-git/removing-a-remote.md

@@ -6,6 +6,7 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 The `git remote rm` command takes one argument:

content/github/using-git/renaming-a-remote.md

@@ -6,6 +6,7 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 The `git remote rename` command takes two arguments:

content/github/using-git/resolving-merge-conflicts-after-a-git-rebase.md

@@ -6,6 +6,7 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 

content/github/using-git/setting-your-username-in-git.md

@@ -6,6 +6,7 @@ redirect_from:
 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.

content/github/using-git/splitting-a-subfolder-out-into-a-new-repository.md

@@ -7,6 +7,7 @@ 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.

content/github/using-git/updating-credentials-from-the-macos-keychain.md

@@ -1,12 +1,13 @@
 ---
 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 {% data variables.product.product_name %}.'
+intro: 'You''ll need to update your saved credentials in the `git-credential-osxkeychain` helper if you change your{% if currentVersion != "github-ae@latest" %} username, password, or{% endif %} 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
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 {% data reusables.user_settings.password-authentication-deprecation %}
@@ -17,15 +18,11 @@ versions:
    ![Spotlight Search bar](/assets/images/help/setup/keychain-access.png)
 2. In Keychain Access, search for **{% data variables.command_line.backticks %}**.
 3. Find the "internet password" entry for `{% data variables.command_line.backticks %}`.
-   ![GitHub Password Entry in Keychain](/assets/images/help/setup/keychain-entry.png)
 4. Edit or delete the entry accordingly.
 
 ### Deleting your credentials via the command line
 
-Through the command line, you can use the credential helper directly to erase the
-keychain entry.
-
-To do this, type the following command:
+Through the command line, you can use the credential helper directly to erase the keychain entry.
 
 ```shell
 $ git credential-osxkeychain erase
@@ -34,9 +31,7 @@ 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 {% data variables.product.product_location %}. If you are prompted for a password, the keychain
-entry was deleted.
+If it's successful, nothing will print out. To test that it works, try and clone a repository from {% data variables.product.product_location %}. If you are prompted for a password, the keychain entry was deleted.
 
 ### Further reading
 

content/github/using-git/using-advanced-git-commands.md

@@ -10,5 +10,6 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 

content/github/using-git/using-common-git-commands.md

@@ -7,5 +7,6 @@ redirect_from:
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 

content/github/using-git/using-git-rebase-on-the-command-line.md

@@ -7,6 +7,7 @@ intro: Here's a short tutorial on using `git rebase` on the command line.
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 In this example, we will cover all of the `git rebase` commands available, except for `exec`.

content/github/using-git/which-remote-url-should-i-use.md

@@ -7,6 +7,7 @@ intro: 'There are several ways to clone repositories available on {% data variab
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
+  github-ae: '*'
 ---
 
 When you view a repository while signed in to your account, the URLs you can use to clone the project onto your computer are available below the repository details:
@@ -47,7 +48,7 @@ When you `git clone`, `git fetch`, `git pull`, or `git push` to a remote reposit
 
 {% endtip %}
 
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %}
 
 ### Cloning with {% data variables.product.prodname_cli %}
 
@@ -55,11 +56,13 @@ You can also install {% data variables.product.prodname_cli %} to use {% data va
 
 {% endif %}
 
+{% if currentVersion != "github-ae@latest" %}
 ### Cloning with Subversion
 
 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 {% 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)."
+{% endif %}
 
 ### Further reading
 

content/github/using-git/why-is-git-always-asking-for-my-password.md

@@ -6,14 +6,14 @@ redirect_from:
 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 GitHub credentials every time you pull or push a repository.
+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. 
 
-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.
+{% 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. Once you've configured credential caching, Git automatically uses your cached personal access token when you pull or push a repository using HTTPS.
 
 ### Further reading