Git reset: Difference between revisions
Jump to navigation
Jump to search
| Line 27: | Line 27: | ||
==Drop Commits from the Local Feature Branch== | ==Drop Commits from the Local Feature Branch== | ||
This may be necessary if an unwanted merge has been performed, and we want to get rid of it | This may be necessary if an unwanted merge has been performed, and we want to get rid of it (in the example below, we get rid of exactly one commit, which is the HEAD of the branch): | ||
git reset --hard HEAD~1 | git reset --hard HEAD~1 | ||
git push --force | git push --force | ||
Revision as of 23:39, 9 October 2019
Internal
Overview
git reset resets the current working state to the last commit, or the specified commit.
git reset file-name
Discard All Local Changes
git reset --hard HEAD
Resets the index and the working tree to the specified commit, by discarding all local changes to the tracked files.
Other Use Cases
Local and remote origin branches have diverged without activity on the local branch
Resync the Feature Branch with the State of its Tracking Branch
git reset --hard origin/<feature-branch> git reset --hard origin/task/test
Drop Commits from the Local Feature Branch
This may be necessary if an unwanted merge has been performed, and we want to get rid of it (in the example below, we get rid of exactly one commit, which is the HEAD of the branch):
git reset --hard HEAD~1 git push --force