diff --git a/assets/images/help/desktop/diff-selection.png b/assets/images/help/desktop/diff-selection.png index c1ed42b41bc3..53fbd9c2b111 100644 Binary files a/assets/images/help/desktop/diff-selection.png and b/assets/images/help/desktop/diff-selection.png differ diff --git a/assets/images/help/desktop/discard-multiple-lines.png b/assets/images/help/desktop/discard-multiple-lines.png index d66a27c9cb36..513b42983d9b 100644 Binary files a/assets/images/help/desktop/discard-multiple-lines.png and b/assets/images/help/desktop/discard-multiple-lines.png differ diff --git a/assets/images/help/desktop/discard-single-line.png b/assets/images/help/desktop/discard-single-line.png index c1b096dca99f..36d69f9998aa 100644 Binary files a/assets/images/help/desktop/discard-single-line.png and b/assets/images/help/desktop/discard-single-line.png differ diff --git a/assets/images/help/desktop/mac-select-preferences-pane.png b/assets/images/help/desktop/mac-select-preferences-pane.png index 6a391cae504e..975ffc5b2e12 100644 Binary files a/assets/images/help/desktop/mac-select-preferences-pane.png and b/assets/images/help/desktop/mac-select-preferences-pane.png differ diff --git a/assets/images/help/desktop/partial-commit.png b/assets/images/help/desktop/partial-commit.png index f06227237056..6b17dcb796a6 100644 Binary files a/assets/images/help/desktop/partial-commit.png and b/assets/images/help/desktop/partial-commit.png differ diff --git a/assets/images/help/desktop/viewing-changes.png b/assets/images/help/desktop/viewing-changes.png index a67d93edd8e4..6b71d713c57a 100644 Binary files a/assets/images/help/desktop/viewing-changes.png and b/assets/images/help/desktop/viewing-changes.png differ diff --git a/assets/images/help/desktop/window-select-options-pane.png b/assets/images/help/desktop/window-select-options-pane.png index ec4afe0619c6..975ffc5b2e12 100644 Binary files a/assets/images/help/desktop/window-select-options-pane.png and b/assets/images/help/desktop/window-select-options-pane.png differ diff --git a/content/desktop/managing-commits/index.md b/content/desktop/managing-commits/index.md index 66da5fdedeb7..7547727c872f 100644 --- a/content/desktop/managing-commits/index.md +++ b/content/desktop/managing-commits/index.md @@ -1,11 +1,12 @@ --- title: Managing commits -intro: 'You can use {% data variables.product.prodname_desktop %} to amend, cherry-pick, reorder, revert, and squash commits.' +intro: 'You can use {% data variables.product.prodname_desktop %} to amend, cherry-pick, reorder, revert, reset, and squash commits.' versions: feature: desktop children: - /options-for-managing-commits-in-github-desktop - /undoing-a-commit-in-github-desktop + - /resetting-to-a-commit-in-github-desktop - /amending-a-commit-in-github-desktop - /reverting-a-commit-in-github-desktop - /cherry-picking-a-commit-in-github-desktop diff --git a/content/desktop/managing-commits/options-for-managing-commits-in-github-desktop.md b/content/desktop/managing-commits/options-for-managing-commits-in-github-desktop.md index 734e51a53671..4c1392556903 100644 --- a/content/desktop/managing-commits/options-for-managing-commits-in-github-desktop.md +++ b/content/desktop/managing-commits/options-for-managing-commits-in-github-desktop.md @@ -27,6 +27,7 @@ Often, it is difficult to follow these best practices perfectly at the point whe | Option | Description | More information | | ------ | ----------- | ---------------- | | Undo a commit | Restores the changes from a commit to your working directory, so you can make further changes before re-committing. Useful if you made a mistake in the changes you included. Not possible if you have already pushed the commit to the remote repository. | "[AUTOTITLE](/desktop/managing-commits/undoing-a-commit-in-github-desktop)" | +| Reset to commit | Similar to undoing a commit, but restores the changes from all of the commits up to the selected commit to your working directory. Can only be used up to the most recent commit that has been pushed to the remote repository. | "[AUTOTITLE](/desktop/managing-commits/resetting-to-a-commit-in-github-desktop)" | | Amend a commit | Lets you edit your most recent commit message or combine new changes with the most recent commit. Useful if the changes in the previous commit are still valid, but you have made further changes that fit into the same commit. | "[AUTOTITLE](/desktop/managing-commits/amending-a-commit-in-github-desktop)" | | Revert a commit | Creates a new commit that reverses the changes of another commit in your history. Useful if a commit has already been pushed to the remote repository, and you don't want to remove the commit from the repository's history. | "[AUTOTITLE](/desktop/managing-commits/reverting-a-commit-in-github-desktop)" | | Cherry-pick a commit | Copies a commit from one branch to another. Useful if you have accidentally committed changes on the wrong branch, or if you need to apply a bug fix across different branches you're working on. | "[AUTOTITLE](/desktop/managing-commits/cherry-picking-a-commit-in-github-desktop)" | diff --git a/content/desktop/managing-commits/resetting-to-a-commit-in-github-desktop.md b/content/desktop/managing-commits/resetting-to-a-commit-in-github-desktop.md new file mode 100644 index 000000000000..7f4e77f84ebf --- /dev/null +++ b/content/desktop/managing-commits/resetting-to-a-commit-in-github-desktop.md @@ -0,0 +1,24 @@ +--- +title: Resetting to a commit in GitHub Desktop +shortTitle: Resetting to a commit +intro: 'You can reset to any commit up to the one that was last pushed to the remote branch.' +versions: + feature: desktop +--- + +## About resetting to a commit + +If you made a series of commits and want to fix a mistake you made prior to the most recent commit, you can use "reset to commit" in {% data variables.product.prodname_desktop %} to reset the changes in those commits. Resetting to a commit restores the changes in the subsequent commits to your working directory and resets the branch to the selected commit. You can then make changes before committing again, or you can discard changes that you don't want to keep. For more information, see "[AUTOTITLE](/desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop)." + +You can reset to commit up to the most recent commit that has already been pushed to the remote repository. To undo a pushed commit without disrupting the commit history for other contributors, you can revert the commit. For more information, see "[AUTOTITLE](/desktop/managing-commits/reverting-a-commit-in-github-desktop)." + +If you want to edit your most recent commit message, or combine new changes with your most recent commit, you can amend a commit. For more information, see "[AUTOTITLE](/desktop/managing-commits/amending-a-commit-in-github-desktop)." + +## Resetting to a commit + +{% data reusables.desktop.history-tab %} +1. Right-click on the commit you would like to reset to and select **Reset to commit**. + +## Further reading + +- [Git Tools - Reset Demystified](https://git-scm.com/book/en/v2/Git-Tools-Reset-Demystified) in the Git documentation diff --git a/content/desktop/managing-commits/undoing-a-commit-in-github-desktop.md b/content/desktop/managing-commits/undoing-a-commit-in-github-desktop.md index 3af4f217da6b..e2f25421db32 100644 --- a/content/desktop/managing-commits/undoing-a-commit-in-github-desktop.md +++ b/content/desktop/managing-commits/undoing-a-commit-in-github-desktop.md @@ -10,7 +10,7 @@ versions: If you made a mistake in your changes, you can undo a commit in {% data variables.product.prodname_desktop %}. Undoing a commit restores the changes in the commit to your working directory and resets the branch to the previous commit, so you can make further changes before committing again. -You can undo multiple sequential commits, until you reach a commit that has already been pushed to the remote repository. To undo a pushed commit without disrupting commit history for other contributors, you can revert the commit. For more information, see "[AUTOTITLE](/desktop/managing-commits/reverting-a-commit-in-github-desktop)." +You can undo multiple sequential commits up to a commit that has already been pushed to the remote repository by selecting a previous commit and using the "reset to commit" option. For more information, see "[AUTOTITLE](/desktop/managing-commits/resetting-to-a-commit-in-github-desktop)." To undo a pushed commit without disrupting commit history for other contributors, you can revert the commit. For more information, see "[AUTOTITLE](/desktop/managing-commits/reverting-a-commit-in-github-desktop)." If you want to edit your most recent commit message, or combine new changes with your most recent commit, you can amend a commit. For more information, see "[AUTOTITLE](/desktop/managing-commits/amending-a-commit-in-github-desktop)." diff --git a/data/reusables/desktop/preferences-options-tabs.md b/data/reusables/desktop/preferences-options-tabs.md index b3e810ee96fb..927b6db83c44 100644 --- a/data/reusables/desktop/preferences-options-tabs.md +++ b/data/reusables/desktop/preferences-options-tabs.md @@ -5,3 +5,4 @@ You can choose from the following options. - Choose **Appearance** to switch between the light or dark theme. - Choose **Prompts** to enable or disable confirmation dialogs before performing destructive actions. - Choose **Advanced** for more configuration options. +- Choose **Accessibility** to configure accessibility options. diff --git a/package-lock.json b/package-lock.json index 3e00dfbc0819..9016d92b8bae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -148,7 +148,7 @@ "mkdirp": "^3.0.0", "mockdate": "^3.0.5", "nock": "^13.5.4", - "nodemon": "3.1.0", + "nodemon": "3.1.2", "npm-merge-driver-install": "^3.0.0", "nth-check": "2.1.1", "prettier": "^3.2.5", @@ -10862,9 +10862,9 @@ "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==" }, "node_modules/nodemon": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.0.tgz", - "integrity": "sha512-xqlktYlDMCepBJd43ZQhjWwMw2obW/JRvkrLxq5RCNcuDDX1DbcPT+qT1IlIIdf+DhnWs90JpTMe+Y5KxOchvA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.2.tgz", + "integrity": "sha512-/Ib/kloefDy+N0iRTxIUzyGcdW9lzlnca2Jsa5w73bs3npXjg+WInmiX6VY13mIb6SykkthYX/U5t0ukryGqBw==", "dev": true, "dependencies": { "chokidar": "^3.5.2", diff --git a/package.json b/package.json index 86b32e91370d..c855472aa351 100644 --- a/package.json +++ b/package.json @@ -335,7 +335,7 @@ "mkdirp": "^3.0.0", "mockdate": "^3.0.5", "nock": "^13.5.4", - "nodemon": "3.1.0", + "nodemon": "3.1.2", "npm-merge-driver-install": "^3.0.0", "nth-check": "2.1.1", "prettier": "^3.2.5",