Difference between revisions of "Git reset"

From NovaOrdis Knowledge Base
Jump to: navigation, search
(Drop Commits)
(Drop Commits from the Local Feature Branch)
 
(One intermediate revision by the same user not shown)
Line 25: Line 25:
 
  git reset --hard origin/task/test
 
  git reset --hard origin/task/test
  
==Drop Commits==
+
==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

Latest 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

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