撤消尚未推送的Git合并

#1 楼

git reset --hard commit_sha

git reset --hard HEAD~1

git reset --hard ORIG_HEAD

git reset --merge ORIG_HEAD

#2 楼

git reset --hard origin/master

#3 楼

git revert -m 1 commit_hash

#4 楼

git reset --merge ORIG_HEAD

#5 楼

git merge --abort

#6 楼

git reset --hard HEAD^

#7 楼

fbb0c0f HEAD@{0}: commit (merge): Merge branch 'master' into my-branch
43b6032 HEAD@{1}: checkout: moving from master to my-branch
e3753a7 HEAD@{2}: rebase finished: returning to refs/heads/master
e3753a7 HEAD@{3}: pull --rebase: checkout e3753a71d92b032034dcb299d2df2edc09b5830e
b41ea52 HEAD@{4}: reset: moving to HEAD^
8400a0f HEAD@{5}: rebase: aborting

#8 楼

git merge --abort

git reset --merge

git reset --hard

git merge --abort is equivalent to git reset --merge when MERGE_HEAD is present.

#9 楼

git reset --hard HEAD^
git status

# On branch master
# Your branch and 'origin/master' have diverged,
# and have 3 and 3 different commit(s) each, respectively.

> git reset --hard HEAD^
HEAD is now at [...truncated...]
> git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 3 and 3 different commit(s) each, respectively.
> git reset --hard HEAD^
HEAD is now at [...truncated...]
> git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 3 different commit(s) each, respectively.
> git reset --hard HEAD^
HEAD is now at [...truncated...]
> git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 3 different commit(s) each, respectively.
> git reset --hard HEAD^
HEAD is now at [...truncated...]
> git status
# On branch master
# Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.

> git pull
Updating 2df6af4..12bbd2f
Fast forward
 app/views/truncated |    9 ++++++---
 app/views/truncated |   13 +++++++++++++
 app/views/truncated |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
> git status
# On branch master

git reset --hard HEAD^
git reset --hard HEAD^
git reset --hard HEAD^
git reset --hard HEAD^
git pull

#10 楼

git checkout <commit_id>
git checkout -b <new branch> <commit_id>
git checkout HEAD~X // x is the number of commits t go back

# Checkout a given commit. 
# Doing so will result in a `detached HEAD` which mean that the `HEAD`
# is not pointing to the latest so you will need to checkout branch
# in order to be able to update the code.
git checkout <commit-id>

# create a new branch forked to the given commit
git checkout -b <branch name>

git reflog
git checkout HEAD@{...}

 # This will destroy any local modifications.
# Don't do it if you have uncommitted work you want to keep.
git reset --hard 0d1d7fc32

# Alternatively, if there's work to keep:
git stash
git reset --hard 0d1d7fc32
git stash pop
# This saves the modifications, then reapplies that patch after resetting.
# You could get merge conflicts if you've modified things which were
# changed since the commit you reset to.
 

#11 楼

$ git reflog
$ git reset --hard HEAD@{0}

#12 楼

#13 楼

git reset --hard remotes/origin/HEAD

#14 楼

git merge --abort

git reset --hard origin/develop

git checkout master 
##to delete one branch, you need to be on another branch, otherwise you will fall with the branch :) 

git branch -D develop
git checkout -b develop origin/develop

#15 楼

$ git checkout -f

#16 楼

#17 楼

#18 楼

#19 楼

#20 楼

git checkout develop
git branch -D master
git branch -t master origin/master

#21 楼

#22 楼

git log --oneline feature-1
a1b2c3d4 Merge branch 'dev' into 'feature-1' <-- the merge you want to undo
e5f6g7h8 Fix NPE in the Zero Point Module <-- the one before the merge, you probably want this one

git checkout e5f6g7h8

git checkout -b feature-1

#23 楼

#24 楼

#25 楼

#26 楼

git reset HEAD~1
# Make sure what you are reverting is in fact the merge files
git add .
git reset --hard

#27 楼

$ git reset f836e4c1fa51524658b9f026eb5efa24afaf3a36

$ git reset f836e4c1fa51524658b9f026eb5efa24afaf3a36 --hard

$ git log 4c3e23f529b581c3cbe95350e84e66e3cb05704f

commit 4c3e23f529b581c3cbe95350e84e66e3cb05704f

...

commit 16b373a96b0a353f7454b141f7aa6f548c979d0a

...

    git cherry-pick ec59ab844cf504e462f011c8cc7e5667ebb2e9c7

git diff 5216b24822ea1c48069f648449997879bb49c070..4c3e23f529b581c3cbe95350e84e66e3cb05704f

git cherry-pick 5216b24822ea1c48069f648449997879bb49c070..4c3e23f529b581c3cbe95350e84e66e3cb05704f

#28 楼

#29 楼

#30 楼