Skip to content

Commit

Permalink
[2 / 4] Update ~50 images in desktop directory (github#35040)
Browse files Browse the repository at this point in the history
Co-authored-by: Laura Coursen <lecoursen@github.com>
  • Loading branch information
isaacmbrown and lecoursen authored Feb 28, 2023
1 parent 4c8c7f2 commit fda5729
Show file tree
Hide file tree
Showing 81 changed files with 78 additions and 189 deletions.
Binary file modified assets/images/help/desktop/add-co-author-commit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/desktop/add-local-repository-mac.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/desktop/add-repo-choose-button-mac.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file modified assets/images/help/desktop/branch-history-file.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/desktop/choose-repository-location-mac.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/desktop/clone-a-repository-list-mac.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/help/desktop/clone-button-mac.png
Binary file not shown.
Binary file removed assets/images/help/desktop/clone-button-win.png
Binary file not shown.
Binary file modified assets/images/help/desktop/clone-choose-button-mac.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/desktop/clone-file-menu-mac.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/desktop/commit-all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/help/desktop/commit-button.png
Binary file not shown.
Binary file removed assets/images/help/desktop/commit-some.png
Binary file not shown.
Binary file modified assets/images/help/desktop/diff-selection.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified assets/images/help/desktop/discard-changes-mac.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/desktop/discard-multiple-lines.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/desktop/discard-single-line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/desktop/expand-diff-view.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/desktop/history-tab-in-commit-sidebar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/desktop/mac-adjust-permissions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified assets/images/help/desktop/mac-create-pull-request.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Binary file modified assets/images/help/desktop/mac-fork-behavior-menu-contribute.png
Diff not rendered.
Diff not rendered.
Binary file removed assets/images/help/desktop/mac-fork-own-purposes.png
Diff not rendered.
Binary file removed assets/images/help/desktop/mac-forking-continue.png
Diff not rendered.
Binary file modified assets/images/help/desktop/mac-install-command-line-tool.png
Diff not rendered.
Binary file modified assets/images/help/desktop/mac-stash-all-changes.png
Binary file modified assets/images/help/desktop/partial-commit.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed assets/images/help/desktop/push-origin-button.png
Diff not rendered.
Binary file modified assets/images/help/desktop/select-branch-from-dropdown.png
Diff not rendered.
Binary file removed assets/images/help/desktop/stashed-changes.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ shortTitle: Add a repository

{% mac %}

1. In the **File** menu, click **Add Local Repository**.
![Add Local Repository menu option](/assets/images/help/desktop/add-local-repository-mac.png)
2. Click **Choose...** and, using the Finder window, navigate to the local repository you want to add.
![The Local Path field in the Mac app](/assets/images/help/desktop/add-repo-choose-button-mac.png)
4. Click **Add Repository**.
![The Add repository button in the Mac app](/assets/images/help/desktop/add-repository-button-mac.png)
1. In the menu bar, select **File**, then click **Add Local Repository**.
![Screenshot of the menu bar on a Mac. The "File" dropdown menu is open, and an option labeled "Add Local Repository" is highlighted with an orange outline.](/assets/images/help/desktop/add-local-repository-mac.png)
2. In the "Add Local Repository" window, click **Choose...**, then use the Finder window to navigate to the local repository you want to add.
![Screenshot of the "Add Local Repository" window. Next to the "repository path" field, a button, labeled "Choose", is highlighted with an orange outline.](/assets/images/help/desktop/add-repo-choose-button-mac.png)
3. When you have chosen the local repository, in the "Add Local Repository" window, click **Add Repository**.

{% endmac %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ shortTitle: Add an existing project
{% mac %}

{% data reusables.git.remove-git-remote %}
2. [Add the repository to GitHub Desktop](/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-a-repository-from-your-local-computer-to-github-desktop).
1. [Add the repository to GitHub Desktop](/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-a-repository-from-your-local-computer-to-github-desktop).
{% data reusables.desktop.publish-repository %}
4. Type the desired name of the repository in the **Name** field or use the default current local repository name.
![The Name field](/assets/images/help/desktop/publish-repository-name-mac.png)
5. To publish a public repository, unselect **Keep this code private**.
![Keep this code private checkbox](/assets/images/help/desktop/publish-repository-private-checkbox-mac.png)
6. Choose the organization in the **Organization** drop-down where you want to publish the repository, or select **None** to publish the repository to your personal account.
![Organization drop-down](/assets/images/help/desktop/publish-repository-org-dropdown-mac.png)
7. Click the **Publish Repository** button.
![The Publish repository button in the Publish Repository dialog](/assets/images/help/desktop/publish-repository-dialog-button-mac.png)
1. In the "Publish Repository" window, in the "Name" field, type the desired name of the repository or use the default current local repository name.
1. Optionally, add a description for the repository.
1. Optionally, to publish a public repository, deselect **Keep this code private**.
1. Select the "Organization" dropdown menu, then either click the organization where you want to publish the repository, or, to publish the repository to your personal account, click **None**.
1. Click **Publish Repository**.

{% endmac %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ shortTitle: Commit & review changes

1. [Create a new branch](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches), or select an existing branch by clicking {% octicon "git-branch" aria-label="The branch icon" %} **Current Branch** on the toolbar and selecting the branch from the list.

![Drop down menu to switch your current branch](/assets/images/help/desktop/select-branch-from-dropdown.png)
![Screenshot of the "Current Branch" dropdown view. Under "Recent Branches", a branch, named "my-feature", is highlighted with an orange outline.](/assets/images/help/desktop/select-branch-from-dropdown.png)
{% data reusables.desktop.make-changes %}

## Choosing how to display diffs
Expand All @@ -29,38 +29,36 @@ 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**.

![Diff option menu](/assets/images/help/desktop/diff-selection.png)
![Screenshot of the diff view of a "README" file. A gear icon is outlined in orange above an expanded dropdown displaying "Whitespace" and "Diff display" settings.](/assets/images/help/desktop/diff-selection.png)

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.
- To see the entire file, right-click in the diff view and click **Expand Whole File**.

![Expand diff view](/assets/images/help/desktop/expand-diff-view.png)
![Screenshot of the diff view of a "README" file. Over a green "addition" line, in a context menu, the cursor hovers over "Expand Whole File".](/assets/images/help/desktop/expand-diff-view.png)

## Selecting changes to include in a commit

As you make changes to files in your text editor and save them locally, you will also see the changes in {% data variables.product.prodname_desktop %}.

In the "Changes" tab in the left sidebar:

* The red {% octicon "diff-removed" aria-label="The diff removed icon color-red" %} icon indicates removed files.
* The yellow {% octicon "diff-modified" aria-label="The diff modified icon color-yellow" %} icon indicates modified files.
* The green {% octicon "diff-added" aria-label="The diff added icon color-green" %} icon indicates added files.
* To access stashed changes, click **Stashed Changes**.

![Stashed changes option](/assets/images/help/desktop/stashed-changes.png)
* {% data reusables.desktop.commit-all-desc %}

![Select checkbox to commit all changed files](/assets/images/help/desktop/commit-all.png)
![Screenshot of the "Changes" tab. Above the list of changed files, next to the text "3 changed files", a selected checkbox is outlined in orange.](/assets/images/help/desktop/commit-all.png)
* {% data reusables.desktop.commit-some-desc %}

![Select checkboxes next to the files you want to commit](/assets/images/help/desktop/commit-some.png)

### Creating a partial commit

If one file contains multiple changes, but you only want some of those changes to be included in a commit, you can create a partial commit. The rest of your changes will remain intact, so that you can make additional modifications and commits. This allows you to make separate, meaningful commits, such as keeping line break changes in a commit separate from code or prose changes.

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.

![Unselected lines in a file](/assets/images/help/desktop/partial-commit.png)
![Screenshot of the diff view of a text file. Next to the text "I don't want to include this line", the background color behind the line numbers is green, not blue.](/assets/images/help/desktop/partial-commit.png)

## Discarding changes
If you have uncommitted changes that you don't want to keep, you can discard the changes. This will remove the changes from the files on your computer. You can discard all uncommitted changes in one or more files, or you can discard specific lines you added.
Expand All @@ -72,11 +70,9 @@ Discarded changes are saved in a dated file in the Trash. You can recover discar
{% data reusables.desktop.select-discard-files %}
{% data reusables.desktop.click-discard-files %}

![Discard Changes option in context menu](/assets/images/help/desktop/discard-changes-mac.png)
![Screenshot of the "Changes" tab. Two selected files are highlighted in blue. In a context menu, the cursor hovers over "Discard 2 Selected Changes".](/assets/images/help/desktop/discard-changes-mac.png)
{% data reusables.desktop.confirm-discard-files %}

![Discard Changes button in the confirmation dialog](/assets/images/help/desktop/discard-changes-confirm-mac.png)

### Discarding changes in one or more lines
You can discard one or more changed lines that are uncommitted.

Expand All @@ -86,13 +82,13 @@ You can discard one or more changed lines that are uncommitted.

{% endnote %}

To discard one added line, in the list of changed lines, right click on the line you want to discard and select **Discard added line**.
To discard one added line, in the list of changed lines, right-click the line number of the line you want to discard, then select **Discard Added Line**.

![Discard single line in the confirmation dialog](/assets/images/help/desktop/discard-single-line.png)
![Screenshot of the diff view of a file. In a context menu, a cursor hovers over "Discard Added Line", highlighted in blue.](/assets/images/help/desktop/discard-single-line.png)

To discard a group of changed lines, right click the vertical bar to the right of the line numbers for the lines you want to discard, then select **Discard added lines**.
To discard a group of changed lines, right-click the vertical bar to the right of the line numbers for the lines you want to discard, then select **Discard added lines**.

![Discard a group of added lines in the confirmation dialog](/assets/images/help/desktop/discard-multiple-lines.png)
![Screenshot of the diff view of a file. To the right of the line numbers, a narrow, darker blue line is highlighted with an orange outline.](/assets/images/help/desktop/discard-multiple-lines.png)


## Write a commit message and push your changes
Expand All @@ -110,23 +106,17 @@ Once you're satisfied with the changes you've chosen to include in your commit,
![Screenshot of the "Changes" tab in the sidebar. To the right of a profile picture, a text field containing a commit message is outlined in orange.](/assets/images/help/desktop/commit-message.png)
1. Optionally, to attribute a commit to another author, click the add co-authors icon and type the username(s) you want to include.

![Add a co-author to the commit message](/assets/images/help/desktop/add-co-author-commit.png)
![Screenshot of the "Changes" tab. In the corner of the "Description" field, a "person with a plus sign" icon for adding a co-author is outlined in orange.](/assets/images/help/desktop/add-co-author-commit.png)
{% data reusables.desktop.commit-button %}

![Commit button](/assets/images/help/desktop/commit-button.png)
4. If the branch you're trying to commit to is protected, Desktop will warn you.
- To move your changes, click **switch branches**.
- To commit your changes to the protected branch, click **Commit to _BRANCH_**.

For more information about protected branches, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches)".
- To commit your changes to the protected branch, click **Commit to BRANCH**.

![Protected branch warning](/assets/images/help/desktop/protected-branch-warning.png)
For more information about protected branches, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches)."
{% data reusables.desktop.push-origin %}

6. If you have a pull request based off the branch you are working on, {% data variables.product.prodname_desktop %} will display the status of the checks that have run for the pull request. For more information about checks, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop)."

![Checks display next to branch name](/assets/images/help/desktop/checks-dialog.png)
6. If you have a pull request based off the branch you are working on, {% data variables.product.prodname_desktop %} will display the status of the checks that have run for the pull request next to the "Current Branch" section of the repository bar. For more information about checks, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop)."

If a pull request has not been created for the current branch, {% data variables.product.prodname_desktop %} will give you the option to create one. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request)."

![Creating a pull request](/assets/images/help/desktop/mac-create-pull-request.png)
![Screenshot of the "No local changes" view. A button, labeled "Create Pull Request", is highlighted with an orange outline.](/assets/images/help/desktop/mac-create-pull-request.png)
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ You can always create a branch in {% data variables.product.prodname_desktop %}
{% mac %}

{% data reusables.desktop.click-base-branch-in-drop-down %}
![Drop-down menu to switch your current branch](/assets/images/help/desktop/select-branch-from-dropdown.png)
![Screenshot of the "Current Branch" dropdown view. Under "Recent Branches", a branch, named "my-feature", is highlighted with an orange outline.](/assets/images/help/desktop/select-branch-from-dropdown.png)
{% data reusables.desktop.create-new-branch %}
![New Branch option in the Branch menu](/assets/images/help/desktop/new-branch-button-mac.png)
{% data reusables.desktop.name-branch %}
Expand Down Expand Up @@ -74,7 +74,7 @@ You can always create a branch in {% data variables.product.prodname_desktop %}
If you create a branch on {% data variables.product.product_name %}, you'll need to publish the branch to make it available for collaboration on {% data variables.product.prodname_dotcom %}.

1. At the top of the app, click {% octicon "git-branch" aria-label="The branch icon" %} **Current Branch**, then click the branch that you want to publish.
![Drop-down menu to select which branch to publish](/assets/images/help/desktop/select-branch-from-dropdown.png)
![Screenshot of the "Current Branch" dropdown view. Under "Recent Branches", a branch, named "my-feature", is highlighted with an orange outline.](/assets/images/help/desktop/select-branch-from-dropdown.png)
2. Click **Publish branch**.
![The Publish branch button](/assets/images/help/desktop/publish-branch-button.png)

Expand All @@ -88,7 +88,7 @@ You can view and make commits to any of your repository's branches. If you have

{% data reusables.desktop.current-branch-menu %}
{% data reusables.desktop.switching-between-branches %}
![List of branches in the repository](/assets/images/help/desktop/select-branch-from-dropdown.png)
![Screenshot of the "Current Branch" dropdown view. Under "Recent Branches", a branch, named "my-feature", is highlighted with an orange outline.](/assets/images/help/desktop/select-branch-from-dropdown.png)
3. If you have saved, uncommitted changes, choose **Leave my changes** or **Bring my changes**, then click **Switch Branch**.
![Switch branch with changes options](/assets/images/help/desktop/stash-changes-options.png)

Expand All @@ -99,7 +99,7 @@ You can't delete a branch if it's currently associated with an open pull request
{% mac %}

{% data reusables.desktop.select-branch-to-delete %}
![Drop-down menu to select which branch to delete](/assets/images/help/desktop/select-branch-from-dropdown.png)
![Screenshot of the "Current Branch" dropdown view. Under "Recent Branches", a branch, named "my-feature", is highlighted with an orange outline.](/assets/images/help/desktop/select-branch-from-dropdown.png)
{% data reusables.desktop.delete-branch-mac %}
![Delete... option in the Branch menu](/assets/images/help/desktop/delete-branch-mac.png)

Expand All @@ -108,7 +108,7 @@ You can't delete a branch if it's currently associated with an open pull request
{% windows %}

{% data reusables.desktop.select-branch-to-delete %}
![Drop-down menu to select which branch to delete](/assets/images/help/desktop/select-branch-from-dropdown.png)
![Screenshot of the "Current Branch" dropdown view. Under "Recent Branches", a branch, named "my-feature", is highlighted with an orange outline.](/assets/images/help/desktop/select-branch-from-dropdown.png)
{% data reusables.desktop.delete-branch-win %}
![Delete... option in the Branch menu](/assets/images/help/desktop/delete-branch-win.png)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ Each commit shows:

{% data reusables.desktop.history-tab %}
2. On the **History** tab, click the commit you'd like to review.
![A commit on the History tab](/assets/images/help/desktop/branch-history-commit.png)
3. If there are multiple files in the commit, click on an individual file to see the changes made to that file in that commit.
![A file in the commit](/assets/images/help/desktop/branch-history-file.png)
![Screenshot of a commit view. To the right of the "History" tab, in a list of files, the "hello.txt" file is selected and highlighted with an orange outline.](/assets/images/help/desktop/branch-history-file.png)

## Further reading

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Before you create a pull request, you'll need to push changes to a branch on {%

1. Switch to the branch that you want to create a pull request for. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#switching-between-branches)."
2. Click **Create Pull Request**. {% data variables.product.prodname_desktop %} will open your default browser to take you to {% data variables.product.prodname_dotcom %}.
![The Create Pull Request button](/assets/images/help/desktop/mac-create-pull-request.png)
![Screenshot of the "No local changes" view. A button, labeled "Create Pull Request", is highlighted with an orange outline.](/assets/images/help/desktop/mac-create-pull-request.png)
4. On {% data variables.product.prodname_dotcom %}, confirm that the branch in the **base:** drop-down menu is the branch where you want to merge your changes. Confirm that the branch in the **compare:** drop-down menu is the topic branch where you made your changes.
![Drop-down menus for choosing the base and compare branches](/assets/images/help/desktop/base-and-compare-branches.png)
{% data reusables.repositories.pr-title-description %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ versions:
{% mac %}

1. In the menu bar, select the **{% data variables.product.prodname_desktop %}** menu, then click **Install Command Line Tool**.
![Install Command Line Tool option in the {% data variables.product.prodname_desktop %} drop-down menu](/assets/images/help/desktop/mac-install-command-line-tool.png)
![Screenshot of the menu bar on a Mac. Under the expanded "GitHub Desktop" dropdown menu, the cursor hovers over "Install command line tool", highlighted in blue.](/assets/images/help/desktop/mac-install-command-line-tool.png)
2. Open Terminal.
3. {% data reusables.desktop.launch-desktop-from-command-line %}

Expand Down
Loading

0 comments on commit fda5729

Please sign in to comment.