Skip to content

Commit 46b0a78

Browse files
authored
Merge branch 'main' into managing-accessibility-settings
2 parents 5c84677 + 9c5c364 commit 46b0a78

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Squashing allows you to combine multiple commits in your branch's history into a
1616
{% data reusables.desktop.current-branch-menu %}
1717
2. In the list of branches, select the branch that has the commits that you want to squash.
1818
{% data reusables.desktop.history-tab %}
19-
4. Select the commits to squash and drop them on the commit you want to combine them with. You can select one commit or select multiple commits using <kbd></kbd> or <kbd>Shift</kbd>.
19+
4. Select the commits to squash and drop them on the commit you want to combine them with. You can select one commit or select multiple commits using <kbd>Command</kbd> or <kbd>Shift</kbd>.
2020
![squash drag and drop](/assets/images/help/desktop/squash-drag-and-drop.png)
2121
5. Modify the commit message of your new commit. The commit messages of the selected commits you want to squash are pre-filled into the **Summary** and **Description** fields.
2222
6. Click **Squash Commits**.

content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ Name | Description
7474
**`admin:gpg_key`** | Fully manage GPG keys.
7575
&emsp;`write:gpg_key`| Create, list, and view details for GPG keys.
7676
&emsp;`read:gpg_key`| List and view details for GPG keys.{% ifversion fpt or ghec %}
77-
**`codespace`** | Grants the ability to create and manage codespaces. Codespaces can expose a GITHUB_TOKEN which may have a different set of scopes. For more information, see "[Security in Codespaces](/codespaces/codespaces-reference/security-in-codespaces#authentication)."
78-
**`workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes. For more information, see "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token)."{% endif %}
77+
**`codespace`** | Grants the ability to create and manage codespaces. Codespaces can expose a GITHUB_TOKEN which may have a different set of scopes. For more information, see "[Security in Codespaces](/codespaces/codespaces-reference/security-in-codespaces#authentication)."{% endif %}
78+
**`workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes. For more information, see "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token)."
7979

8080
{% note %}
8181

content/get-started/using-github/github-command-palette.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ The ability to run commands directly from your keyboard, without navigating thro
2929
## Opening the {% data variables.product.prodname_command_palette %}
3030

3131
Open the command palette using one of the following keyboard shortcuts:
32-
- Windows and Linux: <kbd>Ctrl</kbd><kbd>k</kbd> or <kbd>Ctrl</kbd><kbd>alt</kbd><kbd>k</kbd>
33-
- Mac: <kbd></kbd><kbd>k</kbd> or <kbd></kbd><kbd>option</kbd><kbd>k</kbd>
32+
- Windows and Linux: <kbd>Ctrl</kbd>+<kbd>K</kbd> or <kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>K</kbd>
33+
- Mac: <kbd>Command</kbd>+<kbd>K</kbd> or <kbd>Command</kbd>+<kbd>Option</kbd>+<kbd>K</kbd>
3434

3535
When you open the command palette, it shows your location at the top left and uses it as the scope for suggestions (for example, the `mashed-avocado` organization).
3636

@@ -39,7 +39,7 @@ When you open the command palette, it shows your location at the top left and us
3939
{% note %}
4040

4141
**Notes:**
42-
- If you are editing Markdown text, open the command palette with <kbd>Ctrl</kbd><kbd>alt</kbd><kbd>k</kbd> (Windows and Linux) or <kbd></kbd><kbd>option</kbd><kbd>k</kbd> (Mac).
42+
- If you are editing Markdown text, open the command palette with <kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>K</kbd> (Windows and Linux) or <kbd>Command</kbd>+<kbd>Option</kbd>+<kbd>K</kbd> (Mac).
4343
- If you are working on a project (beta), a project-specific command palette is displayed instead. For more information, see "[Customizing your project (beta) views](/issues/trying-out-the-new-projects-experience/customizing-your-project-views)."
4444

4545
{% endnote %}
@@ -60,7 +60,7 @@ You can use the command palette to navigate to any page that you have access to
6060

6161
4. Finish entering the path, or use the arrow keys to highlight the path you want from the list of suggestions.
6262

63-
5. Use <kbd>Enter</kbd> to jump to your chosen location. Alternatively, use <kbd>Ctrl</kbd><kbd>Enter</kbd> (Windows and Linux) or <kbd></kbd><kbd>Enter</kbd> (Mac) to open the location in a new browser tab.
63+
5. Use <kbd>Enter</kbd> to jump to your chosen location. Alternatively, use <kbd>Ctrl</kbd>+<kbd>Enter</kbd> (Windows and Linux) or <kbd>Command</kbd>+<kbd>Enter</kbd> (Mac) to open the location in a new browser tab.
6464

6565
## Searching with the {% data variables.product.prodname_command_palette %}
6666

@@ -87,7 +87,7 @@ You can use the command palette to search for anything on {% data variables.prod
8787

8888
{% endtip %}
8989

90-
5. Use the arrow keys to highlight the search result you want and use <kbd>Enter</kbd> to jump to your chosen location. Alternatively, use <kbd>Ctrl</kbd><kbd>Enter</kbd> (Windows and Linux) or <kbd></kbd><kbd>Enter</kbd> (Mac) to open the location in a new browser tab.
90+
5. Use the arrow keys to highlight the search result you want and use <kbd>Enter</kbd> to jump to your chosen location. Alternatively, use <kbd>Ctrl</kbd>+<kbd>Enter</kbd> (Windows and Linux) or <kbd>Command</kbd>+<kbd>Enter</kbd> (Mac) to open the location in a new browser tab.
9191

9292
## Running commands from the {% data variables.product.prodname_command_palette %}
9393

@@ -98,7 +98,7 @@ You can use the {% data variables.product.prodname_command_palette %} to run com
9898

9999
For a full list of supported commands, see "[{% data variables.product.prodname_command_palette %} reference](#github-command-palette-reference)."
100100

101-
1. Use <kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>k</kbd> (Windows and Linux) or <kbd></kbd><kbd>Shift</kbd><kbd>k</kbd> (Mac) to open the command palette in command mode. If you already have the command palette open, press <kbd>></kbd> to switch to command mode. {% data variables.product.prodname_dotcom %} suggests commands based on your location.
101+
1. Use <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>K</kbd> (Windows and Linux) or <kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>K</kbd> (Mac) to open the command palette in command mode. If you already have the command palette open, press <kbd>></kbd> to switch to command mode. {% data variables.product.prodname_dotcom %} suggests commands based on your location.
102102

103103
![Command palette command mode](/assets/images/help/command-palette/command-palette-command-mode.png)
104104

@@ -112,8 +112,8 @@ For a full list of supported commands, see "[{% data variables.product.prodname_
112112

113113
When the command palette is active, you can use one of the following keyboard shortcuts to close the command palette:
114114

115-
- Search and navigation mode: <kbd>esc</kbd> or <kbd>Ctrl</kbd><kbd>k</kbd> (Windows and Linux) <kbd></kbd><kbd>k</kbd> (Mac)
116-
- Command mode: <kbd>esc</kbd> or <kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>k</kbd> (Windows and Linux) <kbd></kbd><kbd>Shift</kbd><kbd>k</kbd> (Mac)
115+
- Search and navigation mode: <kbd>Esc</kbd> or <kbd>Ctrl</kbd>+<kbd>K</kbd> (Windows and Linux) <kbd>Command</kbd>+<kbd>K</kbd> (Mac)
116+
- Command mode: <kbd>Esc</kbd> or <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>K</kbd> (Windows and Linux) <kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>K</kbd> (Mac)
117117

118118
## {% data variables.product.prodname_command_palette %} reference
119119

@@ -128,9 +128,9 @@ These keystrokes are available when the command palette is in navigation and sea
128128
|<kbd>@</kbd>| Search for users, organizations, and repositories. For more information, see "[Searching with the {% data variables.product.prodname_command_palette %}](#searching-with-the-github-command-palette)."|
129129
|<kbd>/</kbd>| Search for files within a repository scope or repositories within an organization scope. For more information, see "[Searching with the {% data variables.product.prodname_command_palette %}](#searching-with-the-github-command-palette)." |
130130
|<kbd>!</kbd>| Search just for projects. For more information, see "[Searching with the {% data variables.product.prodname_command_palette %}](#searching-with-the-github-command-palette)."|
131-
|<kbd>Ctrl</kbd><kbd>c</kbd> or <kbd></kbd><kbd>c</kbd>| Copy the search or navigation URL for the highlighted result to the clipboard.|
131+
|<kbd>Ctrl</kbd>+<kbd>C</kbd> or <kbd>Command</kbd>+<kbd>C</kbd>| Copy the search or navigation URL for the highlighted result to the clipboard.|
132132
|<kbd>Enter</kbd>| Jump to the highlighted result or run the highlighted command.|
133-
|<kbd>Ctrl</kbd><kbd>Enter</kbd> or <kbd></kbd><kbd>Enter</kbd>| Open the highlighted search or navigation result in a new brower tab.|
133+
|<kbd>Ctrl</kbd>+<kbd>Enter</kbd> or <kbd>Command</kbd>+<kbd>Enter</kbd>| Open the highlighted search or navigation result in a new brower tab.|
134134
|<kbd>?</kbd>| Display help within the command palette.|
135135

136136
### Global commands
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1. In your menu bar, click **Branch**, then click **Delete...**. You can also press <kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>D</kbd>.
1+
1. In your menu bar, click **Branch**, then click **Delete...**. You can also press <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>D</kbd>.

0 commit comments

Comments
 (0)