Desktop menu updates for menu name changes - follow up to a data residency ship (#52844)
This commit is contained in:
Felicity Chapman
Binary file not shown.
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 105 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 132 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 85 KiB |
@@ -83,8 +83,8 @@ shortTitle: Configure default editor
|
||||
{% mac %}
|
||||
|
||||
{% data reusables.desktop.mac-select-desktop-menu %}
|
||||
1. In the Preferences window, select **Integrations**.
|
||||
|
||||
1. In the Settings window, select **Integrations**.
|
||||
|
||||
1. Under "External Editor", use the dropdown menu to select the editor you want to set as your default.
|
||||
1. Click **Save**.
|
||||
|
||||
@@ -103,10 +103,9 @@ shortTitle: Configure default editor
|
||||
## Configuring a custom editor
|
||||
|
||||
{% data reusables.desktop.mac-select-desktop-menu %}
|
||||
1. In the Preferences window, select **Integrations**.
|
||||
|
||||
1. In the Settings window, select **Integrations**.
|
||||
|
||||
1. Under "External Editor", use the dropdown menu to select **Configure Custom Editor**.
|
||||
|
||||
1. Click **Choose** to open the system dialog to navigate to the path of your custom editor.
|
||||
1. Under "Arguments", enter any arguments you would like to use after the "%TARGET_PATH%" variable. Reference supporting documentation for your custom editor to ensure you have the arguments set correctly, as invalid arguments can prevent the editor from launching in {% data variables.product.prodname_desktop %}.
|
||||
1. Click **Save**.
|
||||
|
||||
@@ -13,11 +13,11 @@ shortTitle: Configure basic settings
|
||||
{% mac %}
|
||||
|
||||
{% data reusables.desktop.mac-select-desktop-menu %}
|
||||
1. To view or change your settings, toggle between the panes in the "Preferences" window.
|
||||
1. To view or change your settings, toggle between the panes in the "Settings" window.
|
||||
|
||||
|
||||
|
||||
|
||||
{% data reusables.desktop.preferences-options-tabs %}
|
||||
{% data reusables.desktop.settings-options-tabs %}
|
||||
|
||||
{% endmac %}
|
||||
|
||||
@@ -28,7 +28,7 @@ shortTitle: Configure basic settings
|
||||
|
||||
|
||||
|
||||
{% data reusables.desktop.preferences-options-tabs %}
|
||||
{% data reusables.desktop.settings-options-tabs %}
|
||||
|
||||
{% endwindows %}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ Configuring your global author information in {% data variables.product.prodname
|
||||
{% mac %}
|
||||
|
||||
{% data reusables.desktop.mac-select-desktop-menu %}
|
||||
{% data reusables.desktop.preferences-git-pane %}
|
||||
{% data reusables.desktop.settings-git-pane %}
|
||||
{% data reusables.desktop.name-field-git-config %}
|
||||
{% data reusables.desktop.select-email-git-config %}
|
||||
{% data reusables.desktop.click-save-git-config %}
|
||||
@@ -89,8 +89,8 @@ You can configure the default branch that will be used when you create a new rep
|
||||
{% mac %}
|
||||
|
||||
{% data reusables.desktop.mac-select-desktop-menu %}
|
||||
{% data reusables.desktop.preferences-git-pane %}
|
||||
1. Under "Default branch name for new repositories", select the default branch name you would like to use, or, to enter a custom name, select "Other...".
|
||||
{% data reusables.desktop.settings-git-pane %}
|
||||
1. Optional, under "Default branch name for new repositories" edit the name of the default branch as needed.
|
||||
{% data reusables.desktop.click-save-git-config %}
|
||||
|
||||
{% endmac %}
|
||||
|
||||
@@ -37,7 +37,9 @@ To change how you view diffs, in the top-right corner of the diff view, click {%
|
||||
* To change how the entire diff is displayed, under "Diff display", select **Unified** or **Split**. The Unified view shows changes linearly, while the Split view shows old content on the left side and new content on the right side.
|
||||
* To hide whitespace changes so you can focus on more substantive changes, select **Hide Whitespace Changes**.
|
||||
|
||||
|
||||
|
||||
|
||||
{% data reusables.desktop.diff-tab-size-tip %}
|
||||
|
||||
If you need to see more of the file than {% data variables.product.prodname_desktop %} shows by default, you can expand the diff.
|
||||
* To see the next few lines above or below the highlighted changes, click the arrow above or below the line numbers.
|
||||
@@ -66,7 +68,7 @@ If one file contains multiple changes, but you only want some of those changes t
|
||||
|
||||
To exclude changed lines from your commit, click one or more changed lines so the blue disappears. The lines that are still highlighted in blue will be included in the commit.
|
||||
|
||||
|
||||
|
||||
|
||||
## Discarding changes
|
||||
|
||||
@@ -115,7 +117,7 @@ Once you're satisfied with the changes you've chosen to include in your commit,
|
||||
|
||||
1. Optionally, to attribute a commit to another author, click the add co-authors icon and type the username(s) you want to include.
|
||||
|
||||
|
||||
|
||||
{% data reusables.desktop.commit-button %}
|
||||
1. If the branch you're trying to commit to is protected, Desktop will warn you.
|
||||
* To move your changes, click **switch branches**.
|
||||
|
||||
@@ -55,9 +55,9 @@ After you install {% data variables.product.prodname_desktop %}, you can configu
|
||||
|
||||
{% mac %}
|
||||
|
||||
You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialog boxes, and set privacy preferences in the {% data variables.product.prodname_desktop %} Preferences window. For more information, see "[AUTOTITLE](/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)."
|
||||
You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialog boxes, and set privacy preferences in the {% data variables.product.prodname_desktop %} Settings window. For more information, see "[AUTOTITLE](/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)."
|
||||
|
||||
|
||||
|
||||
|
||||
{% endmac %}
|
||||
|
||||
@@ -65,7 +65,7 @@ You can connect or remove accounts on {% data variables.product.prodname_dotcom
|
||||
|
||||
You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialog boxes, and set privacy preferences in the {% data variables.product.prodname_desktop %} Options window. For more information, see "[AUTOTITLE](/desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)."
|
||||
|
||||
|
||||
|
||||
|
||||
{% endwindows %}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ GitHub Desktop keyboard shortcuts on macOS
|
||||
|
||||
| Keyboard shortcut | Description
|
||||
|-----------|------------
|
||||
|<kbd>Command</kbd>+<kbd>,</kbd> | Go to Preferences
|
||||
|<kbd>Command</kbd>+<kbd>,</kbd> | Display the Settings window
|
||||
|<kbd>Command</kbd>+<kbd>H</kbd> | Hide the {% data variables.product.prodname_desktop %} application
|
||||
|<kbd>Option</kbd>+<kbd>Command</kbd>+<kbd>H</kbd> | Hide all other applications
|
||||
|<kbd>Command</kbd>+<kbd>Q</kbd> | Quit {% data variables.product.prodname_desktop %}
|
||||
@@ -80,7 +80,7 @@ GitHub Desktop keyboard shortcuts on Windows
|
||||
|
||||
| Keyboard shortcut | Description
|
||||
|-----------|------------
|
||||
|<kbd>Ctrl</kbd>+<kbd>,</kbd> | Go to Options
|
||||
|<kbd>Ctrl</kbd>+<kbd>,</kbd> | Display the Options window
|
||||
|<kbd>F11</kbd> | Toggle full screen view
|
||||
|<kbd>Ctrl</kbd>+<kbd>0</kbd> | Reset zoom to default text size
|
||||
|<kbd>Ctrl</kbd>+<kbd>=</kbd> | Zoom in for larger text and graphics
|
||||
|
||||
@@ -35,7 +35,7 @@ If system notifications are disabled for {% data variables.product.prodname_desk
|
||||
{% mac %}
|
||||
|
||||
{% data reusables.desktop.mac-select-desktop-menu %}
|
||||
1. In the "Preferences" window, on the "Notifications" pane, select **Enable notifications**.
|
||||
1. In the "Settings" window, on the "Notifications" pane, select **Enable notifications**.
|
||||
1. In the "Enable notifications" description field, click the **Notification Settings** link to open the "Notifications" pane in the macOS "System Settings" window.
|
||||
1. In the "Application Notifications" list, select **{% data variables.product.prodname_desktop %}**.
|
||||
1. Click **Allow Notifications**.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
{% mac %}
|
||||
|
||||
|
||||
|
||||
|
||||
{% endmac %}
|
||||
|
||||
|
||||
11
data/reusables/desktop/diff-tab-size-tip.md
Normal file
11
data/reusables/desktop/diff-tab-size-tip.md
Normal file
@@ -0,0 +1,11 @@
|
||||
{% mac %}
|
||||
|
||||
> [!TIP] The default tab size used to display diffs is 8. You can customize this on the **Appearance** pane of the **Settings** dialog.
|
||||
|
||||
{% endmac %}
|
||||
|
||||
{% windows %}
|
||||
|
||||
> [!TIP] The default tab size used to display diffs is 8. You can customize this on the **Appearance** pane of the **Options** dialog.
|
||||
|
||||
{% endwindows %}
|
||||
@@ -1,3 +1,3 @@
|
||||
1. In the "Preferences" window, click **Git**.
|
||||
1. In the "Settings" window, click **Git**.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user