Update "Configuring Git for GitHub Desktop" article

content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/changing-a-remotes-url-from-github-desktop.md

@@ -11,22 +11,18 @@ shortTitle: Change a remote's URL
 ---
 {% mac %}
 
-1. In the **Repository** menu, click **Repository Settings...**.
-![Repository Settings menu option](/assets/images/help/desktop/repository-settings-mac.png)
-2. In the **Primary remote repository** field, type the desired URL.
-![Primary remote repository field](/assets/images/help/desktop/repository-settings-remote-mac.png)
-3. Click **Save**.
-![The Save button](/assets/images/help/desktop/repository-settings-save-mac.png)
+{% data reusables.desktop.mac-repository-settings-menu %}
+2. Select **Remote**, and in the **Primary remote repository** field, type the desired URL.
+![Primary remote repository field](/assets/images/help/desktop/repository-settings-remote.png)
+{% data reusables.desktop.repository-settings-save %}
 
 {% endmac %}
 
 {% windows %}
 
-1. In the **Repository** menu, click **Repository settings...**.
-![Repository settings menu option](/assets/images/help/desktop/repository-settings-win.png)
-2. In the **Primary remote repository** field, type the desired URL.
-![Primary remote repository field](/assets/images/help/desktop/repository-settings-remote-win.png)
-3. Click **Save**.
-![The Save button](/assets/images/help/desktop/repository-settings-save-win.png)
+{% data reusables.desktop.windows-repository-settings-menu %}
+2. Select **Remote**, and in the **Primary remote repository** field, type the desired URL.
+![Primary remote repository field](/assets/images/help/desktop/repository-settings-remote.png)
+{% data reusables.desktop.repository-settings-save %}
 
 {% endwindows %}

content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-git-for-github-desktop.md

@@ -8,7 +8,13 @@ redirect_from:
 versions:
   fpt: '*'
 ---
-{% data variables.product.prodname_desktop %} uses the email address you set in your local Git configuration to connect commits with your account on {% data variables.product.product_name %}.
+## About configuring Git
+
+{% data variables.product.prodname_desktop %} allows you to set the name and email you would like associated with your commits. You can also choose the default branch you would like used when creating new repositories in {% data variables.product.prodname_desktop %}.
+
+{% data variables.product.prodname_desktop %} uses the email address you set in your local Git configuration to connect commits with your account on {% data variables.product.product_name %}. When logged in to your {% data variables.product.product_name %} account the
+
+{% data variables.product.prodname_desktop %} will automatically detect if the email address being used does not match an email address associated with your current user.
 
 {% data reusables.desktop.update-email-address %}
 
@@ -18,39 +24,86 @@ versions:
 
 {% endtip %}
 
+## Configuring your commit details
+
 {% mac %}
 
-{% data reusables.desktop.sign-in-choose-product %}
-{% data reusables.user-settings.access_settings %}
-{% data reusables.user-settings.emails %}
-{% data reusables.desktop.copy-email-git-config %}
-{% data reusables.desktop.return-to-desktop %}
 {% data reusables.desktop.mac-select-desktop-menu %}
 7. In the Preferences window, click **Git**.
   ![The Git Pane in the Preferences menu](/assets/images/help/desktop/mac-select-git-pane.png)
 {% data reusables.desktop.name-field-git-config %}
   ![The name field of the Git configuration](/assets/images/help/desktop/mac-name-git-config.png)
-{% data reusables.desktop.paste-email-git-config %}
-  ![Pasted email address in Git configuration field](/assets/images/help/desktop/mac-email-git-config.png)
+{% data reusables.desktop.select-email-git-config %}
+  ![Select email address in Git configuration field](/assets/images/help/desktop/mac-email-git-config.png)
 {% data reusables.desktop.click-save-git-config %}
   ![Save button in Git configuration field](/assets/images/help/desktop/mac-save-git-config.png)
 
 {% endmac %}
 
 {% windows %}
 
-{% data reusables.desktop.sign-in-choose-product %}
-{% data reusables.user-settings.access_settings %}
-{% data reusables.user-settings.emails %}
-{% data reusables.desktop.copy-email-git-config %}
-{% data reusables.desktop.return-to-desktop %}
 {% data reusables.desktop.windows-choose-options %}
 8. In the Options window, click **Git**.
 ![The Git Pane in the Options menu](/assets/images/help/desktop/windows-select-git-pane.png)
 {% data reusables.desktop.name-field-git-config %}
   ![The name field of the Git configuration](/assets/images/help/desktop/windows-name-git-config.png)
-{% data reusables.desktop.paste-email-git-config %}
-  ![Pasted email address in Git configuration field](/assets/images/help/desktop/windows-email-git-config.png)
+{% data reusables.desktop.select-email-git-config %}
+  ![Select email address in Git configuration field](/assets/images/help/desktop/windows-email-git-config.png)
+{% data reusables.desktop.click-save-git-config %}
+  ![Save button in Git configuration field](/assets/images/help/desktop/windows-save-git-config.png)
+
+{% endwindows %}
+
+## Overriding the email address GitHub Desktop uses for a repository
+
+In {% data variables.product.prodname_desktop %} you can change the name and email address used for commits in a specific repository. This local Git configuration will override your global Git configuration settings in this one repository, but will not affect any other repositories.
+
+{% mac %}
+
+{% data reusables.desktop.mac-repository-settings-menu %}
+{% data reusables.desktop.select-git-config %}
+{% data reusables.desktop.use-local-git-config %}
+{% data reusables.desktop.local-config-name %}
+{% data reusables.desktop.local-config-email %}
+{% data reusables.desktop.repository-settings-save %}
+
+{% endmac %}
+
+{% windows %}
+
+{% data reusables.desktop.windows-repository-settings-menu %}
+{% data reusables.desktop.select-git-config %}
+{% data reusables.desktop.use-local-git-config %}
+{% data reusables.desktop.local-config-name %}
+{% data reusables.desktop.local-config-email %}
+{% data reusables.desktop.repository-settings-save %}
+
+{% endwindows %}
+
+
+## Configuring your default branch for new repositories
+
+You can configure the default branch that will be used when creating a new repository in {% data variables.product.prodname_desktop %}. The default branch is the base branch for pull requests and code commits. For more information about the default branch, see "[About the default branch](/github/collaborating-with-issues-and-pull-requests/about-branches#about-the-default-branch)."
+
+{% mac %}
+
+{% data reusables.desktop.mac-select-desktop-menu %}
+1. In the Preferences window, click **Git**.
+  ![The Git Pane in the Preferences menu](/assets/images/help/desktop/mac-select-git-pane.png)
+1. Under "Default branch name for new repositories", select the default branch name you would like to use, or select "Other..." to enter a custom name.
+  ![Default branch name selection options](/assets/images/help/desktop/mac-select-default-branch-name.png)
+{% data reusables.desktop.click-save-git-config %}
+  ![Save button in Git configuration field](/assets/images/help/desktop/mac-save-git-config.png)
+
+{% endmac %}
+
+{% windows %}
+
+{% data reusables.desktop.windows-choose-options %}
+1. In the Options window, click **Git**.
+  ![The Git Pane in the Options menu](/assets/images/help/desktop/windows-select-git-pane.png)
+1. Under "Default branch name for new repositories", select the default branch name you would like to use, or select "Other..." to enter a custom name.
+  ![Default branch name selection options](/assets/images/help/desktop/windows-select-default-branch-name.png)
 {% data reusables.desktop.click-save-git-config %}
   ![Save button in Git configuration field](/assets/images/help/desktop/windows-save-git-config.png)
 
@@ -60,3 +113,4 @@ versions:
 
 - "[Adding an email address to your GitHub account](/articles/adding-an-email-address-to-your-github-account/)"
 - "[Setting your commit email address](/articles/setting-your-commit-email-address/)"
+- "[About branches](/github/collaborating-with-issues-and-pull-requests/about-branches)"

data/reusables/desktop/local-config-email.md

@@ -0,0 +1,2 @@
+1. In the **Email** field, select the email you'd like to use for your local Git configuration.
+  ![The name field of the local Git configuration](/assets/images/help/desktop/local-config-email.png)

data/reusables/desktop/local-config-name.md

@@ -0,0 +1,2 @@
+1. In the **Name** field, type the name you'd like to use for your local Git configuration.
+  ![The name field of the local Git configuration](/assets/images/help/desktop/local-config-name.png)

data/reusables/desktop/mac-repository-settings-menu.md

@@ -0,0 +1,2 @@
+1. In the **Repository** menu, click **Repository Settings...**.
+![Repository Settings menu option](/assets/images/help/desktop/repository-settings-mac.png)

data/reusables/desktop/repository-settings-save.md

@@ -0,0 +1,2 @@
+1. Click **Save**.
+  ![The Save button](/assets/images/help/desktop/repository-settings-save.png)

data/reusables/desktop/select-email-git-config.md

@@ -0,0 +1 @@
+1. In the **Email** dropdown, select the email address you would like to use for your commits.

data/reusables/desktop/select-git-config.md

@@ -0,0 +1,2 @@
+1. Select **Git Config**.
+![Git Config option](/assets/images/help/desktop/select-git-config.png)

data/reusables/desktop/use-local-git-config.md

@@ -0,0 +1,2 @@
+1. Click **Use a local Git config**.
+![Primary remote repository field](/assets/images/help/desktop/use-local-git-config.png)

data/reusables/desktop/windows-repository-settings-menu.md

@@ -0,0 +1,2 @@
+1. In the **Repository** menu, click **Repository settings...**.
+![Repository settings menu option](/assets/images/help/desktop/repository-settings-win.png)