Git reset: Difference between revisions
Jump to navigation
Jump to search
| Line 19: | Line 19: | ||
{{Internal|Git_Problems#Local_and_Remote_Origin_Branches_Have_Diverged_without_Activity_on_Local_Branch|Local and remote origin branches have diverged without activity on the local branch}} | {{Internal|Git_Problems#Local_and_Remote_Origin_Branches_Have_Diverged_without_Activity_on_Local_Branch|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== | |||
This may be necessary if an unwanted merge has been performed, and we want to get rid of it. | |||
git reset --hard HEAD~1 | |||
Revision as of 18:18, 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
This may be necessary if an unwanted merge has been performed, and we want to get rid of it.
git reset --hard HEAD~1