зеркало из https://github.com/github/docs.git
Provide some additional clarity to various GitHub Desktop articles (#36047)
Co-authored-by: Peter Bengtsson <peterbe@github.com> Co-authored-by: Isaac Brown <101839405+isaacmbrown@users.noreply.github.com>
This commit is contained in:
Steve Ward
GitHub
Родитель
d7bcafa440
Коммит
0e5268eeaa
|
|
@ -86,7 +86,7 @@ jobs:
|
|||
|
||||
const badFiles = badFilesArr.join('\n')
|
||||
|
||||
let reviewMessage = `👋 Hey there spelunker. It looks like you've modified some files that we can't accept as contributions. The complete list of files we can't accept are:\n${badFiles}\n\nYou'll need to revert all of the files you changed in that list using [GitHub Desktop](https://docs.github.com/en/free-pro-team@latest/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/reverting-a-commit) or \`git checkout origin/main <file name>\`. Once you get those files reverted, we can continue with the review process. :octocat:`
|
||||
let reviewMessage = `👋 Hey there spelunker. It looks like you've modified some files that we can't accept as contributions. The complete list of files we can't accept are:\n${badFiles}\n\nYou'll need to revert all of the files you changed in that list using [GitHub Desktop](https://docs.github.com/en/free-pro-team@latest/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/reverting-a-commit-in-github-desktop) or \`git checkout origin/main <file name>\`. Once you get those files reverted, we can continue with the review process. :octocat:`
|
||||
let workflowFailMessage = "It looks like you've modified some files that we can't accept as contributions."
|
||||
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -59,14 +59,14 @@ You can authenticate to {% data variables.product.product_name %} in your browse
|
|||
- After you configure 2FA, your account enters a check up period for 28 days. You can leave the check up period by successfully performing 2FA within those 28 days. If you don't perform 2FA in that timespan, you'll then be asked to perform 2FA inside one of your existing {% data variables.product.prodname_dotcom_the_website %} sessions.
|
||||
- If you cannot perform 2FA to pass the 28th day checkup, you will be provided a shortcut that lets you reconfigure your 2FA settings. You must reconfigure your settings before you can access the rest of {% data variables.product.prodname_dotcom %}{% endif %}. For more information, see "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/accessing-github-using-two-factor-authentication#providing-a-2fa-code-when-signing-in-to-the-website){% ifversion 2fa-check-up-period %}" and "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication){% endif %}."
|
||||
- In addition to authentication with a TOTP application{% ifversion fpt or ghec %} or a text message{% endif %}, you can optionally add an alternative method of authentication with {% ifversion fpt or ghec %}{% data variables.product.prodname_mobile %} or{% endif %} a security key using WebAuthn. For more information, see {% ifversion fpt or ghec %}"[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication#configuring-two-factor-authentication-using-github-mobile)" and {% endif %}"[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication#configuring-two-factor-authentication-using-a-security-key)."
|
||||
|
||||
|
||||
{% ifversion fpt or ghec %}
|
||||
{% note %}
|
||||
|
||||
**Note:** {% data reusables.two_fa.unlink-email-address %}
|
||||
|
||||
{% endnote %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% ifversion ghes %}
|
||||
- **External authentication**
|
||||
- Your site administrator may configure {% data variables.location.product_location %} to use external authentication instead of a username and password. For more information, see "[AUTOTITLE](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise#external-authentication)."{% endif %}{% ifversion fpt or ghec %}
|
||||
|
|
@ -76,7 +76,7 @@ You can authenticate to {% data variables.product.product_name %} in your browse
|
|||
{% endif %}
|
||||
|
||||
## Authenticating with {% data variables.product.prodname_desktop %}
|
||||
You can authenticate with {% data variables.product.prodname_desktop %} using your browser. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github)."
|
||||
You can authenticate with {% data variables.product.prodname_desktop %} using your browser. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github-in-github-desktop)."
|
||||
|
||||
## Authenticating with the API
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ intro: 'You can keep your local repository in sync with your remote repository a
|
|||
versions:
|
||||
fpt: '*'
|
||||
children:
|
||||
- /syncing-your-branch
|
||||
- /syncing-your-branch-in-github-desktop
|
||||
shortTitle: Sync your local repo
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
---
|
||||
title: Syncing your branch
|
||||
title: Syncing your branch in GitHub Desktop
|
||||
shortTitle: Syncing your branch
|
||||
intro: 'As commits are pushed to your project on {% data variables.product.prodname_dotcom %}, you can keep your local copy of the project in sync by pulling from the remote repository.'
|
||||
redirect_from:
|
||||
- /desktop/contributing-to-projects/syncing-your-branch
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/syncing-your-branch
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/keeping-your-local-repository-in-sync-with-github/syncing-your-branch
|
||||
versions:
|
||||
fpt: '*'
|
||||
---
|
||||
|
|
@ -21,7 +23,7 @@ Some workflows require or benefit from rebasing instead of merging. By rebasing
|
|||
|
||||
1. In {% data variables.product.prodname_desktop %}, use the {% octicon "git-branch" aria-label="The branch icon" %} **Current Branch** drop-down, and select the local branch you want to update.
|
||||
2. To check for commits on the remote branch, click **Fetch origin**
|
||||
|
||||
|
||||
|
||||
|
||||
3. To pull any commits from the remote branch, click **Pull origin** or **Pull origin with rebase**.
|
||||
|
|
@ -63,7 +65,7 @@ Some workflows require or benefit from rebasing instead of merging. By rebasing
|
|||
3. If you're sure you want to rebase, click **Begin Rebase**.
|
||||
{% data reusables.desktop.resolve-merge-conflicts %}
|
||||
4. To push your local changes, click **Force push origin**.
|
||||
|
||||
|
||||
|
||||
|
||||
## Squashing and merging another branch into your project branch
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
---
|
||||
title: Committing and reviewing changes to your project
|
||||
title: Committing and reviewing changes to your project in GitHub Desktop
|
||||
intro: '{% data variables.product.prodname_desktop %} tracks all changes to all files as you edit them. You can decide how to group the changes to create meaningful commits.'
|
||||
redirect_from:
|
||||
- /desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/committing-and-reviewing-changes-to-your-project
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project
|
||||
versions:
|
||||
fpt: '*'
|
||||
shortTitle: Commit & review changes
|
||||
|
|
@ -16,7 +17,7 @@ shortTitle: Commit & review changes
|
|||
|
||||
## Choosing a branch and making 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.
|
||||
1. [Create a new branch](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches-in-github-desktop), 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.
|
||||
|
||||
|
||||
{% data reusables.desktop.make-changes %}
|
||||
|
|
@ -97,7 +98,7 @@ Once you're satisfied with the changes you've chosen to include in your commit,
|
|||
|
||||
{% note %}
|
||||
|
||||
**Note**: {% data reusables.desktop.tags-push-with-commits %} For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/managing-tags)."
|
||||
**Note**: {% data reusables.desktop.tags-push-with-commits %} For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/managing-tags-in-github-desktop)."
|
||||
|
||||
{% endnote %}
|
||||
|
||||
|
|
@ -117,7 +118,11 @@ Once you're satisfied with the changes you've chosen to include in your commit,
|
|||
|
||||
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 preview the changes and 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)."
|
||||
|
||||
If a pull request has not been created for the current branch, {% data variables.product.prodname_desktop %} will give you the option to preview the changes and 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-from-github-desktop)."
|
||||
|
||||
|
||||
|
||||
## Further reading
|
||||
|
||||
- "[AUTOTITLE](/get-started/using-git)"
|
||||
|
|
@ -6,11 +6,11 @@ redirect_from:
|
|||
versions:
|
||||
fpt: '*'
|
||||
children:
|
||||
- /managing-branches
|
||||
- /committing-and-reviewing-changes-to-your-project
|
||||
- /stashing-changes
|
||||
- /viewing-the-branch-history
|
||||
- /pushing-changes-to-github
|
||||
- /managing-branches-in-github-desktop
|
||||
- /committing-and-reviewing-changes-to-your-project-in-github-desktop
|
||||
- /stashing-changes-in-github-desktop
|
||||
- /viewing-the-branch-history-in-github-desktop
|
||||
- /pushing-changes-to-github-from-github-desktop
|
||||
shortTitle: Make changes in a branch
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,16 @@
|
|||
---
|
||||
title: Managing branches
|
||||
intro: You can create a branch off of a repository's default branch so you can safely experiment with changes.
|
||||
title: Managing branches in GitHub Desktop
|
||||
shortTitle: Managing branches
|
||||
intro: 'You can use {% data variables.product.prodname_desktop %} to create a new branch off of an existing branch in your repository so you can safely experiment with changes.'
|
||||
redirect_from:
|
||||
- /desktop/contributing-to-projects/creating-a-branch-for-your-work
|
||||
- /desktop/contributing-to-projects/switching-between-branches
|
||||
- /desktop/contributing-to-projects/managing-branches
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-branches
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches
|
||||
versions:
|
||||
fpt: '*'
|
||||
|
||||
---
|
||||
## About managing branches
|
||||
You can use branches to safely experiment with changes to your project. Branches isolate your development work from other branches in the repository. For example, you could use a branch to develop a new feature or fix a bug.
|
||||
|
|
@ -16,7 +19,7 @@ You always create a branch from an existing branch. Typically, you might create
|
|||
|
||||
You can also create a branch starting from a previous commit in a branch's history. This can be helpful if you need to return to an earlier view of the repository to investigate a bug, or to create a hot fix on top of your latest release.
|
||||
|
||||
Once you're satisfied with your work, you can create a pull request to merge your changes in the current branch into another branch. 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)" and "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)."
|
||||
Once you're satisfied with your work, you can create a pull request to merge your changes in the current branch into another branch. 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-from-github-desktop)" and "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)."
|
||||
|
||||
You can always create a branch in {% data variables.product.prodname_desktop %} if you have read access to a repository, but you can only push the branch to {% data variables.product.prodname_dotcom %} if you have write access to the repository.
|
||||
|
||||
|
|
@ -46,7 +49,7 @@ You can always create a branch in {% data variables.product.prodname_desktop %}
|
|||
|
||||
{% data reusables.desktop.history-tab %}
|
||||
2. Right-click on the commit you would like to create a new branch from and select **Create Branch from Commit**.
|
||||
|
||||
|
||||
|
||||
|
||||
{% data reusables.desktop.name-branch %}
|
||||
|
|
@ -62,10 +65,11 @@ If you create a branch on {% data variables.product.product_name %}, you'll need
|
|||
|
||||
|
||||
## Switching between branches
|
||||
You can view and make commits to any of your repository's branches. If you have uncommitted, saved changes, you'll need to decide what to do with your changes before you can switch branches. You can commit your changes on the current branch, stash your changes to temporarily save them on the current branch, or bring the changes to your new branch. If you want to commit your changes before switching branches, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project)."
|
||||
|
||||
You can view and make commits to any of your repository's branches. If you have uncommitted, saved changes, you'll need to decide what to do with your changes before you can switch branches. You can commit your changes on the current branch, stash your changes to temporarily save them on the current branch, or bring the changes to your new branch. If you want to commit your changes before switching branches, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop)."
|
||||
{% tip %}
|
||||
|
||||
**Tip**: You can set a default behavior for switching branches in the **Advanced** settings. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-basic-settings)."
|
||||
**Tip**: You can set a default behavior for switching branches in the **Advanced** settings. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)."
|
||||
|
||||
{% endtip %}
|
||||
|
||||
|
|
@ -101,4 +105,4 @@ You can't delete a branch if it's currently associated with an open pull request
|
|||
- "[AUTOTITLE](/get-started/quickstart/github-glossary#branch)" in the {% data variables.product.prodname_dotcom %} glossary
|
||||
- "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches)"
|
||||
- "[Branches in a Nutshell](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell)" in the Git documentation
|
||||
- "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/stashing-changes)"
|
||||
- "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/stashing-changes-in-github-desktop)"
|
||||
|
|
@ -1,11 +1,12 @@
|
|||
---
|
||||
title: Pushing changes to GitHub
|
||||
title: Pushing changes to GitHub from GitHub Desktop
|
||||
shortTitle: Pushing changes
|
||||
intro: 'As you commit changes to your project locally, you can push those changes to {% data variables.product.prodname_dotcom %} so that others may access them from the remote repository.'
|
||||
intro: 'As you commit changes to your project locally, you can push those changes to {% data variables.product.prodname_dotcom %} from {% data variables.product.prodname_desktop %} so that others may access them from the remote repository.'
|
||||
permissions: People with write permissions can push changes to a repository.
|
||||
redirect_from:
|
||||
- /desktop/contributing-to-projects/pushing-changes-to-github
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/pushing-changes-to-github
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/pushing-changes-to-github
|
||||
versions:
|
||||
fpt: '*'
|
||||
---
|
||||
|
|
@ -32,10 +33,11 @@ If you configure {% data variables.large_files.product_name_long %} to track you
|
|||
|
||||
{% data reusables.desktop.push-origin %}
|
||||
1. If there are commits on the remote branch that you don't have on your local branch, {% data variables.product.prodname_desktop %} prompts you to fetch new commits from the remote. In the "New Commits on Remote" window, click **Fetch**.
|
||||
1. Optionally, click **Preview Pull Request** to open a preview dialog where you can review your changes and begin to create a pull request. 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)."
|
||||
|
||||
1. Optionally, click **Preview Pull Request** to open a preview dialog where you can review your changes and begin to create a pull request. 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-from-github-desktop)."
|
||||
|
||||
|
||||
|
||||
## Further reading
|
||||
- "[AUTOTITLE](/get-started/quickstart/github-glossary#push)" in the {% data variables.product.prodname_dotcom %} glossary
|
||||
- "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project)"
|
||||
- "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop)"
|
||||
- "[AUTOTITLE](/get-started/using-git)"
|
||||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
title: Stashing changes
|
||||
intro: You can temporarily save your changes without committing them to a branch by stashing the changes.
|
||||
title: Stashing changes in GitHub Desktop
|
||||
shortTitle: Stashing changes
|
||||
intro: 'You can temporarily save your changes without committing them to a branch by stashing the changes in {% data variables.product.prodname_desktop %}.'
|
||||
versions:
|
||||
fpt: '*'
|
||||
redirect_from:
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/stashing-changes
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/stashing-changes
|
||||
---
|
||||
## About stashed changes
|
||||
|
||||
To apply your changes to your repository, you must save the files and then commit the changes to a branch. If you have saved changes that you are not ready to commit yet, you can stash the changes for later. When you stash changes, the changes are temporarily removed from the files and you can choose to restore or discard the changes later. You can only stash one set of changes at a time with {% data variables.product.prodname_desktop %}. If you use {% data variables.product.prodname_desktop %} to stash changes, all unsaved changes will be stashed. After you stash changes on a branch, you can safely change branches or make other changes to your current branch.
|
||||
|
||||
If you use {% data variables.product.prodname_desktop %} to switch branches while you have saved, but not committed, changes, {% data variables.product.prodname_desktop %} will prompt you to stash the changes or bring them to the other branch. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#switching-between-branches)."
|
||||
If you use {% data variables.product.prodname_desktop %} to switch branches while you have saved, but not committed, changes, {% data variables.product.prodname_desktop %} will prompt you to stash the changes or bring them to the other branch. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches-in-github-desktop#switching-between-branches)."
|
||||
|
||||
## Stashing changes
|
||||
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
---
|
||||
title: Viewing the branch history
|
||||
title: Viewing the branch history in GitHub Desktop
|
||||
intro: 'You can see details about any commit in {% data variables.product.prodname_desktop %}, including a diff of the changes the commit introduced.'
|
||||
redirect_from:
|
||||
- /desktop/contributing-to-projects/viewing-the-branch-history
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/viewing-the-branch-history
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/viewing-the-branch-history
|
||||
versions:
|
||||
fpt: '*'
|
||||
shortTitle: View branch history
|
||||
|
|
@ -29,11 +30,11 @@ Each commit shows:
|
|||
You can also select a range of multiple consecutive commits using <kbd>Ctrl</kbd> or <kbd>Shift</kbd>.
|
||||
|
||||
{% endwindows %}
|
||||
|
||||
|
||||
|
||||
|
||||
1. If there are multiple files in the commit or range of commits, click on an individual file to see the changes made to that file.
|
||||
|
||||
2. If there are multiple files in the commit or range of commits, click on an individual file to see the changes made to that file.
|
||||
|
||||
|
||||
|
||||
## Further reading
|
||||
|
|
@ -1,8 +1,11 @@
|
|||
---
|
||||
title: Amending a commit
|
||||
title: Amending a commit in Github Desktop
|
||||
shortTitle: Amending commits
|
||||
intro: 'You can use {% data variables.product.prodname_desktop %} to amend your last commit.'
|
||||
versions:
|
||||
fpt: '*'
|
||||
redirect_from:
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/amending-a-commit
|
||||
---
|
||||
|
||||
## About amending a commit
|
||||
|
|
@ -1,10 +1,12 @@
|
|||
---
|
||||
title: Cherry-picking a commit
|
||||
intro: You can pick a specific commit on one branch and copy the commit to another branch.
|
||||
title: Cherry-picking a commit in GitHub Desktop
|
||||
shortTitle: Cherry-picking
|
||||
intro: 'You can use {% data variables.product.prodname_desktop %} to pick a specific commit on one branch and copy the commit to another branch.'
|
||||
versions:
|
||||
fpt: '*'
|
||||
redirect_from:
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/cherry-picking-a-commit
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/cherry-picking-a-commit
|
||||
---
|
||||
## About Git cherry-pick
|
||||
|
||||
|
|
@ -4,11 +4,11 @@ intro: 'You can use {% data variables.product.prodname_desktop %} to amend, cher
|
|||
versions:
|
||||
fpt: '*'
|
||||
children:
|
||||
- /reverting-a-commit
|
||||
- /cherry-picking-a-commit
|
||||
- /reordering-commits
|
||||
- /squashing-commits
|
||||
- /amending-a-commit
|
||||
- /managing-tags
|
||||
- /reverting-a-commit-in-github-desktop
|
||||
- /cherry-picking-a-commit-in-github-desktop
|
||||
- /reordering-commits-in-github-desktop
|
||||
- /squashing-commits-in-github-desktop
|
||||
- /amending-a-commit-in-github-desktop
|
||||
- /managing-tags-in-github-desktop
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
---
|
||||
title: Managing tags
|
||||
title: Managing tags in GitHub Desktop
|
||||
shortTitle: Managing tags
|
||||
intro: 'You can use {% data variables.product.prodname_desktop %} to create, push, and view tags.'
|
||||
redirect_from:
|
||||
- /desktop/contributing-to-projects/managing-tags
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-tags
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/managing-tags
|
||||
versions:
|
||||
fpt: '*'
|
||||
---
|
||||
|
|
@ -33,7 +35,7 @@ versions:
|
|||
|
||||
|
||||
3. All tags associated with the commit are visible in that commit's metadata.
|
||||
|
||||
|
||||
|
||||
|
||||
## Deleting tags
|
||||
|
|
@ -1,8 +1,11 @@
|
|||
---
|
||||
title: Reordering commits
|
||||
title: Reordering commits in GitHub Desktop
|
||||
shortTitle: Reordering commits
|
||||
intro: 'You can use {% data variables.product.prodname_desktop %} to reorder commits in your branch''s history.'
|
||||
versions:
|
||||
fpt: '*'
|
||||
redirect_from:
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/reordering-commits
|
||||
---
|
||||
|
||||
## About reordering a commit
|
||||
|
|
@ -32,8 +35,8 @@ When you reorder commits, you may see one of the following notifications or erro
|
|||
* A notification is shown indicating that there are uncommitted changes present on your current branch. Select **Stash Changes and Continue** to store the changes and proceed, or select **Close** to dismiss the message and commit the changes. When there are no longer any uncommitted changes, you can reorder your commits.
|
||||
* A message states that there are merge conflicts that you must resolve before the application can continue reordering commits on your branch.
|
||||
1. Click **View conflicts**.
|
||||
|
||||
|
||||
|
||||
{% data reusables.desktop.resolve-merge-conflicts %}
|
||||
3. When all conflicts are resolved, you can reorder your commits.
|
||||
|
||||
|
||||
|
|
@ -1,9 +1,11 @@
|
|||
---
|
||||
title: Reverting a commit
|
||||
intro: You can revert a specific commit to remove its changes from your branch.
|
||||
title: Reverting a commit in GitHub Desktop
|
||||
shortTitle: Reverting a commit
|
||||
intro: 'You can use {% data variables.product.prodname_desktop %} to revert a specific commit to remove its changes from your branch.'
|
||||
redirect_from:
|
||||
- /desktop/contributing-to-projects/reverting-a-commit
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/reverting-a-commit
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/reverting-a-commit
|
||||
versions:
|
||||
fpt: '*'
|
||||
---
|
||||
|
|
@ -1,8 +1,11 @@
|
|||
---
|
||||
title: Squashing commits
|
||||
title: Squashing commits in GitHub Desktop
|
||||
shortTitle: Squashing commmits
|
||||
intro: 'You can use {% data variables.product.prodname_desktop %} to squash commits in your branch''s history.'
|
||||
versions:
|
||||
fpt: '*'
|
||||
redirect_from:
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits
|
||||
---
|
||||
|
||||
## About squashing a commit
|
||||
|
|
@ -14,16 +17,16 @@ Squashing allows you to combine multiple commits in your branch's history into a
|
|||
{% data reusables.desktop.current-branch-menu %}
|
||||
2. In the list of branches, select the branch that has the commits that you want to squash.
|
||||
{% data reusables.desktop.history-tab %}
|
||||
4. Select the commits to squash and drop them on the commit you want to combine them with.
|
||||
|
||||
4. Select the commits to squash and drop them on the commit you want to combine them with.
|
||||
|
||||
{% mac %}
|
||||
|
||||
|
||||
You can select one commit or select multiple commits using <kbd>Command</kbd> or <kbd>Shift</kbd>.
|
||||
|
||||
{% endmac %}
|
||||
|
||||
{% windows %}
|
||||
|
||||
|
||||
You can select one commit or select multiple commits using <kbd>Ctrl</kbd> or <kbd>Shift</kbd>.
|
||||
|
||||
{% endwindows %}
|
||||
|
|
@ -1,11 +1,12 @@
|
|||
---
|
||||
title: Changing the remote URL for a repository from GitHub Desktop
|
||||
title: Changing the remote URL for a repository in GitHub Desktop
|
||||
intro: 'You can change the remote URL for a repository you''re working with in {% data variables.product.prodname_desktop %}. You might do this if the repository has been renamed, or the username or organization that owns the repository has changed.'
|
||||
redirect_from:
|
||||
- /desktop/contributing-to-projects/changing-a-remotes-url-from-github-desktop
|
||||
- /desktop/contributing-to-projects/changing-a-remote-s-url-from-github-desktop
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/changing-a-remotes-url-from-github-desktop
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/changing-a-remotes-url-from-github-desktop
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/changing-the-remote-url-for-a-repository-from-github-desktop
|
||||
versions:
|
||||
fpt: '*'
|
||||
shortTitle: Change the remote URL for a repository
|
||||
|
|
@ -13,7 +14,7 @@ shortTitle: Change the remote URL for a repository
|
|||
{% mac %}
|
||||
|
||||
{% data reusables.desktop.mac-repository-settings-menu %}
|
||||
2. On the **Remote** pane, under "Primary remote repository", type the desired URL.
|
||||
1. On the **Remote** pane, under "Primary remote repository", type the desired URL.
|
||||
{% data reusables.desktop.repository-settings-save %}
|
||||
|
||||
{% endmac %}
|
||||
|
|
@ -1,11 +1,12 @@
|
|||
---
|
||||
title: Creating an issue or pull request
|
||||
title: Creating an issue or pull request from GitHub Desktop
|
||||
intro: You can create an issue or pull request to propose and collaborate on changes to a repository.
|
||||
permissions: 'Anyone can create an issue in a public repository that has issues enabled. Anyone with read permissions to a repository can create a pull request, but you must have write permissions to create a branch.'
|
||||
redirect_from:
|
||||
- /desktop/contributing-to-projects/creating-an-issue-or-pull-request
|
||||
- /desktop/contributing-to-projects/creating-a-pull-request
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/creating-an-issue-or-pull-request
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request
|
||||
versions:
|
||||
fpt: '*'
|
||||
shortTitle: Create an issue or PR
|
||||
|
|
@ -19,14 +20,14 @@ After you create a branch and make changes to files in a project, you can create
|
|||
## Prerequisites
|
||||
|
||||
Before you create a pull request, you'll need to push changes to a branch on {% data variables.product.prodname_dotcom %}.
|
||||
- Save and commit any changes on your local branch. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project)."
|
||||
- Save and commit any changes on your local branch. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop)."
|
||||
- Push your local commits to the remote repository. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/pushing-changes-to-github)."
|
||||
- Publish your current branch to {% data variables.product.prodname_dotcom %}. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches)."
|
||||
- Publish your current branch to {% data variables.product.prodname_dotcom %}. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches-in-github-desktop)."
|
||||
|
||||
## Creating an issue
|
||||
|
||||
1. In the menu bar, select **Repository**, then click **Create Issue on {% data variables.product.prodname_dotcom %}**.
|
||||
|
||||
|
||||
{% mac %}
|
||||
|
||||
|
||||
|
|
@ -6,11 +6,11 @@ redirect_from:
|
|||
versions:
|
||||
fpt: '*'
|
||||
children:
|
||||
- /creating-an-issue-or-pull-request
|
||||
- /creating-an-issue-or-pull-request-from-github-desktop
|
||||
- /viewing-a-pull-request-in-github-desktop
|
||||
- /viewing-and-re-running-checks-in-github-desktop
|
||||
- /configuring-notifications-in-github-desktop
|
||||
- /changing-the-remote-url-for-a-repository-from-github-desktop
|
||||
- /changing-the-remote-url-for-a-repository-in-github-desktop
|
||||
shortTitle: Work with your remote repo
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -8,19 +8,19 @@ featuredLinks:
|
|||
startHere:
|
||||
- /desktop/installing-and-configuring-github-desktop/overview/creating-your-first-repository-using-github-desktop
|
||||
- /desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/installing-github-desktop
|
||||
- /desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github
|
||||
- /desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-in-github-desktop
|
||||
guideCards:
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/stashing-changes
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/reverting-a-commit
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/amending-a-commit
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/cherry-picking-a-commit
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/stashing-changes-in-github-desktop
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/reverting-a-commit-in-github-desktop
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/amending-a-commit-in-github-desktop
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits/cherry-picking-a-commit-in-github-desktop
|
||||
popular:
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/keeping-your-local-repository-in-sync-with-github/syncing-your-branch
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/pushing-changes-to-github
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches-in-github-desktop
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/managing-commits-in-github-desktop
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/keeping-your-local-repository-in-sync-with-github/syncing-your-branch-in-github-desktop
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request-from-github-desktop
|
||||
- /desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/pushing-changes-to-github-from-github-desktop
|
||||
changelog:
|
||||
label: desktop
|
||||
versions:
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
---
|
||||
title: Configuring a default editor
|
||||
intro: You can configure GitHub Desktop to open files in your project with your preferred text editor or integrated development environment (IDE).
|
||||
title: Configuring a default editor in GitHub Desktop
|
||||
intro: 'You can configure {% data variables.product.prodname_desktop %} to open files in your project with your preferred text editor or integrated development environment (IDE).'
|
||||
redirect_from:
|
||||
- /desktop/getting-started-with-github-desktop/configuring-a-default-editor
|
||||
- /desktop/installing-and-configuring-github-desktop/configuring-a-default-editor
|
||||
- /desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor
|
||||
versions:
|
||||
fpt: '*'
|
||||
shortTitle: Configure default editor
|
||||
|
|
@ -90,6 +91,6 @@ shortTitle: Configure default editor
|
|||
3. In the Options window, select **Integrations**.
|
||||
|
||||
4. Under "External Editor", use the dropdown menu to select the editor you want to set as your default.
|
||||
5. Click **Save**.
|
||||
5. Click **Save**.
|
||||
|
||||
{% endwindows %}
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
---
|
||||
title: Configuring basic settings
|
||||
intro: 'You can access settings for protecting your privacy, connecting accounts to GitHub Desktop, and configuring Git.'
|
||||
title: Configuring basic settings in GitHub Desktop
|
||||
intro: 'You can access settings for protecting your privacy, connecting accounts to {% data variables.product.prodname_desktop %}, and configuring Git.'
|
||||
redirect_from:
|
||||
- /desktop/getting-started-with-github-desktop/configuring-basic-settings
|
||||
- /desktop/installing-and-configuring-github-desktop/configuring-basic-settings
|
||||
- /desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-basic-settings
|
||||
versions:
|
||||
fpt: '*'
|
||||
shortTitle: Configure basic settings
|
||||
|
|
@ -11,8 +12,8 @@ shortTitle: Configure basic settings
|
|||
{% mac %}
|
||||
|
||||
{% data reusables.desktop.mac-select-desktop-menu %}
|
||||
3. 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 "Preferences" window.
|
||||
|
||||
|
||||
|
||||
{% indented_data_reference reusables.desktop.preferences-options-tabs spaces=3 %}
|
||||
|
|
@ -23,7 +24,7 @@ shortTitle: Configure basic settings
|
|||
|
||||
{% data reusables.desktop.windows-choose-options %}
|
||||
3. To view or change your settings, toggle between the panes in the "Options" window.
|
||||
|
||||
|
||||
|
||||
|
||||
{% indented_data_reference reusables.desktop.preferences-options-tabs spaces=3 %}
|
||||
|
|
@ -101,7 +101,7 @@ You can configure the default branch that will be used when you create a new rep
|
|||
1. In the Options window, click **Git**.
|
||||
|
||||
|
||||
|
||||
|
||||
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.click-save-git-config %}
|
||||
|
||||
|
|
@ -112,3 +112,4 @@ You can configure the default branch that will be used when you create a new rep
|
|||
- "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/adding-an-email-address-to-your-github-account)"
|
||||
- "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address)"
|
||||
- "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches)"
|
||||
- "[AUTOTITLE](/get-started/getting-started-with-git)"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ versions:
|
|||
fpt: '*'
|
||||
children:
|
||||
- /configuring-git-for-github-desktop
|
||||
- /configuring-basic-settings
|
||||
- /configuring-a-default-editor
|
||||
- /configuring-basic-settings-in-github-desktop
|
||||
- /configuring-a-default-editor-in-github-desktop
|
||||
- /setting-a-theme-for-github-desktop
|
||||
- /about-git-large-file-storage-and-github-desktop
|
||||
shortTitle: Configure & customize
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
---
|
||||
title: About connections to GitHub
|
||||
title: About connections to GitHub in GitHub Desktop
|
||||
intro: '{% data variables.product.prodname_desktop %} uses HTTPS to securely exchange data with {% data variables.product.prodname_dotcom %}.'
|
||||
redirect_from:
|
||||
- /desktop/getting-started-with-github-desktop/about-connections-to-github
|
||||
- /desktop/installing-and-configuring-github-desktop/about-connections-to-github
|
||||
- /desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/about-connections-to-github
|
||||
versions:
|
||||
fpt: '*'
|
||||
shortTitle: About connections
|
||||
|
|
@ -1,11 +1,12 @@
|
|||
---
|
||||
title: Authenticating to GitHub
|
||||
title: Authenticating to GitHub in GitHub Desktop
|
||||
shortTitle: Authentication
|
||||
intro: 'You can securely access your account''s resources on {% data variables.product.prodname_desktop %} by authenticating to {% data variables.product.prodname_dotcom %}.'
|
||||
redirect_from:
|
||||
- /desktop/getting-started-with-github-desktop/authenticating-to-github-using-the-browser
|
||||
- /desktop/getting-started-with-github-desktop/authenticating-to-github
|
||||
- /desktop/installing-and-configuring-github-desktop/authenticating-to-github
|
||||
- /desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github
|
||||
versions:
|
||||
fpt: '*'
|
||||
---
|
||||
|
|
@ -36,12 +37,12 @@ Before you authenticate, {% data reusables.desktop.get-an-account %}
|
|||
1. In the "Preferences" window, on the **Accounts** pane, click the **Sign In** button next to "{% data variables.product.prodname_enterprise %}".
|
||||
|
||||
|
||||
|
||||
|
||||
1. To add an account on {% data variables.location.product_location_enterprise %}, in the "Sign in" modal window, type the URL for your instance under "Enterprise address," then click **Continue**.
|
||||
{% data reusables.desktop.sign-in-browser %}
|
||||
1. To authenticate to {% data variables.location.product_location_enterprise %} account, type your account credentials and click **Sign in**.
|
||||
|
||||
Alternatively, if you were already signed in to {% data variables.location.product_location_enterprise %} account, follow the prompts to return to {% data variables.product.prodname_desktop %} to finish authenticating.
|
||||
Alternatively, if you were already signed in to {% data variables.location.product_location_enterprise %} account, follow the prompts to return to {% data variables.product.prodname_desktop %} to finish authenticating.
|
||||
|
||||
{% endmac %}
|
||||
|
||||
|
|
@ -8,8 +8,8 @@ versions:
|
|||
children:
|
||||
- /setting-up-github-desktop
|
||||
- /installing-github-desktop
|
||||
- /authenticating-to-github
|
||||
- /about-connections-to-github
|
||||
- /authenticating-to-github-in-github-desktop
|
||||
- /about-connections-to-github-in-github-desktop
|
||||
- /updating-github-desktop
|
||||
- /uninstalling-github-desktop
|
||||
shortTitle: Install & authenticate
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ versions:
|
|||
---
|
||||
## Part 1: Installing {% data variables.product.prodname_desktop %}
|
||||
|
||||
You can install {% data variables.product.prodname_desktop %} on any supported operating system. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/overview/supported-operating-systems)."
|
||||
You can install {% data variables.product.prodname_desktop %} on any supported operating system. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/overview/supported-operating-systems-for-github-desktop)."
|
||||
|
||||
To install {% data variables.product.prodname_desktop %}, navigate to [https://desktop.github.com/](https://desktop.github.com/) and download the appropriate version of {% data variables.product.prodname_desktop %} for your operating system. Follow the prompts to complete the installation. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/installing-github-desktop)."
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ If you do not already have an account on {% data variables.product.prodname_dotc
|
|||
If you are part of an organization that uses {% data variables.product.prodname_enterprise %} and you do not have an account, contact your {% data variables.product.prodname_enterprise %} site administrator.
|
||||
|
||||
### Authenticating to {% data variables.product.prodname_dotcom %}
|
||||
To connect to {% data variables.product.prodname_desktop %} with {% data variables.product.prodname_dotcom %}, you'll need to authenticate your account. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github)."
|
||||
To connect to {% data variables.product.prodname_desktop %} with {% data variables.product.prodname_dotcom %}, you'll need to authenticate your account. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github-in-github-desktop)."
|
||||
|
||||
After authenticating your account, you are ready to manage and contribute to projects with {% data variables.product.prodname_desktop %}.
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ After you have Git installed, you'll need to configure Git for {% data variables
|
|||
You can adjust defaults and settings to tailor {% data variables.product.prodname_desktop %} to your needs.
|
||||
|
||||
### Choosing a default text editor
|
||||
You can open a text editor from {% data variables.product.prodname_desktop %} to manipulate files and repositories. {% data variables.product.prodname_desktop %} supports a variety of text editors and integrated development environments (IDEs) for Windows and macOS. You can choose a default editor in the {% data variables.product.prodname_desktop %} settings. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor)."
|
||||
You can open a text editor from {% data variables.product.prodname_desktop %} to manipulate files and repositories. {% data variables.product.prodname_desktop %} supports a variety of text editors and integrated development environments (IDEs) for Windows and macOS. You can choose a default editor in the {% data variables.product.prodname_desktop %} settings. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor-in-github-desktop)."
|
||||
|
||||
### Choosing a theme
|
||||
{% data variables.product.prodname_desktop %} has multiple themes available to customize the look and feel of the app. You can choose a theme in the {% data variables.product.prodname_desktop %} settings. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/setting-a-theme-for-github-desktop)."
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ redirect_from:
|
|||
- /desktop/installing-and-configuring-github-desktop/uninstalling-github-desktop
|
||||
versions:
|
||||
fpt: '*'
|
||||
shortTitle: Uninstall GitHub Desktop
|
||||
shortTitle: Uninstalling
|
||||
---
|
||||
{% mac %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
---
|
||||
title: Updating GitHub Desktop
|
||||
shortTitle: Updating
|
||||
intro: GitHub Desktop automatically downloads updates and installs them when you restart. You can also manually check for updates.
|
||||
redirect_from:
|
||||
- /desktop/getting-started-with-github-desktop/updating-github-desktop
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ At the top of the {% data variables.product.prodname_desktop %} app, you will se
|
|||
|
||||
### Changes and History
|
||||
In the left sidebar, you'll find the **Changes** and **History** views.
|
||||
|
||||
|
||||
|
||||
|
||||
- The **Changes** view shows changes you've made to files in your current branch but haven't committed to your local repository. At the bottom, there is a box with "Summary" and "Description" text boxes and a **Commit to BRANCH** button. This is where you'll commit new changes. The **Commit to BRANCH** button is dynamic and will display which branch you're committing your changes to.
|
||||
|
|
@ -79,7 +79,7 @@ When you create a new repository, it only exists on your computer and you are th
|
|||
## Part 5: Making, committing, and pushing changes
|
||||
Now that you've created and published your repository, you're ready to make changes to your project and start crafting your first commit to your repository.
|
||||
|
||||
1. To launch your external editor from within {% data variables.product.prodname_desktop %}, in the "{% data variables.product.prodname_desktop %}" menu bar, select **Repository**, then click **Open in EDITOR**. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor)."
|
||||
1. To launch your external editor from within {% data variables.product.prodname_desktop %}, in the "{% data variables.product.prodname_desktop %}" menu bar, select **Repository**, then click **Open in EDITOR**. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor-in-github-desktop)."
|
||||
|
||||
|
||||
2. Make some changes to the _README.md_ file that you previously created. You can add information that describes your project, like what it does and why it is useful. When you are satisfied with your changes, save them in your text editor.
|
||||
|
|
@ -91,7 +91,7 @@ Now that you've created and published your repository, you're ready to make chan
|
|||
5. Below your commit message, click **Commit to BRANCH NAME**. The commit button shows your current branch so you can be sure to commit to the branch you want.
|
||||
6. To push your changes to the remote repository on {% data variables.product.product_name %}, click **Push origin**.
|
||||
|
||||
|
||||
|
||||
- The **Push origin** button is the same one that you clicked to publish your repository to {% data variables.product.product_name %}. This button changes contextually based on where you are at in the Git workflow. It should now say `Push origin` with a `1` next to it, indicating that there is one commit that has not been pushed up to {% data variables.product.product_name %}.
|
||||
- The "origin" in **Push origin** means that you are pushing changes to the remote called `origin`, which in this case is your project's repository on {% data variables.product.prodname_dotcom_the_website %}. Until you push any new commits to {% data variables.product.product_name %}, there will be differences between your project's repository on your computer and your project's repository on {% data variables.product.prodname_dotcom_the_website %}. This allows you to work locally and only push your changes to {% data variables.product.prodname_dotcom_the_website %} when you're ready.
|
||||
7. In the window to the right of the **Changes** view, you'll see suggestions for actions you can do next. To open the repository on {% data variables.product.product_name %} in your browser, click **View on {% data variables.product.product_name %}**.
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ You might find it helpful to have a basic understanding of Git and {% data varia
|
|||
{% data variables.product.prodname_desktop %} is an open source project. You can see the roadmap, contribute to the project, or open an issue to provide feedback or feature requests. For more information, see the [`desktop/desktop`](https://github.com/desktop/desktop) repository.
|
||||
|
||||
## Part 1: Installing and authenticating
|
||||
You can install {% data variables.product.prodname_desktop %} on any supported operating system. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/overview/supported-operating-systems)."
|
||||
You can install {% data variables.product.prodname_desktop %} on any supported operating system. For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/overview/supported-operating-systems-for-github-desktop)."
|
||||
|
||||
To install {% data variables.product.prodname_desktop %}, visit the download page for [{% data variables.product.prodname_desktop %}](https://desktop.github.com/). For more information, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/installing-github-desktop)."
|
||||
|
||||
|
|
@ -34,14 +34,14 @@ After you have installed {% data variables.product.prodname_desktop %}, you can
|
|||
3. In the "Preferences" window, on the **Accounts** pane, click one of the **Sign In** buttons to sign in to your account on {% data variables.product.prodname_dotcom_the_website %} or {% data variables.product.prodname_enterprise %}.
|
||||
|
||||
|
||||
4. Follow the steps to sign in. For more information about authentication, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github)."
|
||||
4. Follow the steps to sign in. For more information about authentication, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github-in-github-desktop)."
|
||||
|
||||
{% endmac %}
|
||||
|
||||
{% windows %}
|
||||
|
||||
1. Before you can authenticate to {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, you will need an account. For more information about creating an account, see "[AUTOTITLE](/get-started/signing-up-for-github/signing-up-for-a-new-github-account)" or contact your {% data variables.product.prodname_enterprise %} site administrator.
|
||||
2. In the File drop-down menu, click **Options**. In the options window, click **Accounts** and follow the steps to sign in. For more information on authenticating, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github)."
|
||||
2. In the File drop-down menu, click **Options**. In the options window, click **Accounts** and follow the steps to sign in. For more information on authenticating, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github-in-github-desktop)."
|
||||
|
||||
|
||||
{% endwindows %}
|
||||
|
|
@ -51,7 +51,7 @@ 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/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-basic-settings)."
|
||||
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/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)."
|
||||
|
||||
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ You can connect or remove accounts on {% data variables.product.prodname_dotcom
|
|||
|
||||
{% windows %}
|
||||
|
||||
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/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-basic-settings)."
|
||||
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/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-basic-settings-in-github-desktop)."
|
||||
|
||||
|
||||
|
||||
|
|
@ -88,14 +88,14 @@ You can clone a repository from {% data variables.product.prodname_dotcom %} by
|
|||
{% endwindows %}
|
||||
|
||||
### Making changes in a branch
|
||||
You can use {% data variables.product.prodname_desktop %} to create a branch of a project. Branches isolate your development work from other branches in the repository, so that you can safely experiment with changes. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches)."
|
||||
You can use {% data variables.product.prodname_desktop %} to create a branch of a project. Branches isolate your development work from other branches in the repository, so that you can safely experiment with changes. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches-in-github-desktop)."
|
||||
|
||||
After you make changes to a branch, you can review them in {% data variables.product.prodname_desktop %} and make a commit to keep track of your changes. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project)."
|
||||
|
||||
If you want to access your changes remotely or share them with other people, you can push your commits to {% data variables.product.prodname_dotcom %}. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/pushing-changes-to-github)."
|
||||
|
||||
### Collaborating with {% data variables.product.prodname_desktop %}
|
||||
You can use {% data variables.product.prodname_desktop %} to create issues or pull requests to collaborate on projects with other people. Issues help you keep track of ideas and discuss possible changes to projects. Pull requests let you share your proposed changes with others, receive feedback, and merge changes into a project. 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)."''
|
||||
You can use {% data variables.product.prodname_desktop %} to create issues or pull requests to collaborate on projects with other people. Issues help you keep track of ideas and discuss possible changes to projects. Pull requests let you share your proposed changes with others, receive feedback, and merge changes into a project. 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-from-github-desktop)."''
|
||||
|
||||
You can view your own or your collaborator's pull requests in {% data variables.product.prodname_desktop %}. Viewing a pull request in {% data variables.product.prodname_desktop %} lets you see any proposed changes and make additional changes by opening the project's files and repositories in your default text editor. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-a-pull-request-in-github-desktop)."
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
---
|
||||
title: Keyboard shortcuts
|
||||
title: GitHub Desktop keyboard shortcuts
|
||||
shortTitle: Keyboard shortcuts
|
||||
intro: 'You can use keyboard shortcuts in {% data variables.product.prodname_desktop %}.'
|
||||
redirect_from:
|
||||
- /desktop/getting-started-with-github-desktop/keyboard-shortcuts-in-github-desktop
|
||||
- /desktop/getting-started-with-github-desktop/keyboard-shortcuts
|
||||
- /desktop/installing-and-configuring-github-desktop/keyboard-shortcuts
|
||||
- /desktop/installing-and-configuring-github-desktop/overview/keyboard-shortcuts
|
||||
versions:
|
||||
fpt: '*'
|
||||
---
|
||||
|
|
@ -8,8 +8,8 @@ versions:
|
|||
children:
|
||||
- /getting-started-with-github-desktop
|
||||
- /creating-your-first-repository-using-github-desktop
|
||||
- /supported-operating-systems
|
||||
- /keyboard-shortcuts
|
||||
- /supported-operating-systems-for-github-desktop
|
||||
- /github-desktop-keyboard-shortcuts
|
||||
- /launching-github-desktop-from-the-command-line
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
---
|
||||
title: Supported operating systems
|
||||
title: Supported operating systems for GitHub Desktop
|
||||
intro: 'You can use {% data variables.product.prodname_desktop %} on any supported operating system.'
|
||||
redirect_from:
|
||||
- /desktop/getting-started-with-github-desktop/supported-operating-systems
|
||||
- /desktop/installing-and-configuring-github-desktop/supported-operating-systems
|
||||
- /desktop/installing-and-configuring-github-desktop/overview/supported-operating-systems
|
||||
versions:
|
||||
fpt: '*'
|
||||
shortTitle: Supported OS
|
||||
|
|
@ -121,7 +121,7 @@ git checkout BRANCH-NAME
|
|||
|
||||
{% desktop %}
|
||||
|
||||
For more information about how to create and manage branches in {% data variables.product.prodname_desktop %}, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches)."
|
||||
For more information about how to create and manage branches in {% data variables.product.prodname_desktop %}, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches-in-github-desktop)."
|
||||
|
||||
{% enddesktop %}
|
||||
|
||||
|
|
@ -151,7 +151,7 @@ git commit -m "a short description of the change"
|
|||
|
||||
{% desktop %}
|
||||
|
||||
For more information about how to stage and commit changes in {% data variables.product.prodname_desktop %}, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project#selecting-changes-to-include-in-a-commit)."
|
||||
For more information about how to stage and commit changes in {% data variables.product.prodname_desktop %}, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop#selecting-changes-to-include-in-a-commit)."
|
||||
|
||||
{% enddesktop %}
|
||||
|
||||
|
|
|
|||
|
|
@ -67,4 +67,4 @@ You can use the file tree to navigate between files in a commit.
|
|||
{% endif %}
|
||||
|
||||
## Further reading
|
||||
- "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project#about-commits)" on {% data variables.product.prodname_desktop %}
|
||||
- "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop#about-commits)" on {% data variables.product.prodname_desktop %}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-manag
|
|||
|
||||
## Creating co-authored commits using {% data variables.product.prodname_desktop %}
|
||||
|
||||
You can use {% data variables.product.prodname_desktop %} to create a commit with a co-author. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project#write-a-commit-message-and-push-your-changes)" and [{% data variables.product.prodname_desktop %}](https://desktop.github.com).
|
||||
You can use {% data variables.product.prodname_desktop %} to create a commit with a co-author. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop#write-a-commit-message-and-push-your-changes)" and [{% data variables.product.prodname_desktop %}](https://desktop.github.com).
|
||||
|
||||
## Creating co-authored commits on the command line
|
||||
|
||||
|
|
@ -83,4 +83,4 @@ The new commit and message will appear on {% data variables.location.product_loc
|
|||
- "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile)"{% endif %}
|
||||
- "[AUTOTITLE](/repositories/viewing-activity-and-data-for-your-repository/viewing-a-projects-contributors)"
|
||||
- "[AUTOTITLE](/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/changing-a-commit-message)"
|
||||
- "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project#4-write-a-commit-message-and-push-your-changes)" in the {% data variables.product.prodname_desktop %} documentation
|
||||
- "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop#4-write-a-commit-message-and-push-your-changes)" in the {% data variables.product.prodname_desktop %} documentation
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
If a repository has any protected branches, you can't edit or upload files in the protected branch using {% data variables.product.prodname_dotcom %}. For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches)."
|
||||
|
||||
You can use {% data variables.product.prodname_desktop %} to move your changes to a new branch and commit them. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project)."
|
||||
You can use {% data variables.product.prodname_desktop %} to move your changes to a new branch and commit them. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop)."
|
||||
|
|
|
|||
|
|
@ -370,7 +370,7 @@ describe('redirects', () => {
|
|||
|
||||
describe('desktop guide', () => {
|
||||
const desktopGuide =
|
||||
'/en/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request'
|
||||
'/en/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request-from-github-desktop'
|
||||
|
||||
test('no language code redirects to english', async () => {
|
||||
const res = await get(
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче