blocks|key|2730531|text|您可以使用git-reset命令。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2730532|2730533|+git-reset+-将当前磁头重置为|blockquote|2730534|2730535|指定的状态。git重置--混合%7C|2730536|--soft+%7C+--hard+%7C+--merge+[]+git+reset+-q|2730537|--…git重置--补丁|2730538|…|2730539|2730540|GIT-Reset|offset|length|2730541|entityMap|0|LINK|mutability|MUTABLE|url|http://git-scm.com/docs/git-reset^0|0|0|0|0|0|0|0|0|0|0|9|0|0^^$0|@$1|2|3|4|5|6|7|11|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|12|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|13|8|@]|9|@]|A|$]]|$1|F|3|-4|5|6|7|14|8|@]|9|@]|A|$]]|$1|G|3|H|5|6|7|15|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|16|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|17|8|@]|9|@]|A|$]]|$1|M|3|N|5|6|7|18|8|@]|9|@]|A|$]]|$1|O|3|-4|5|6|7|19|8|@]|9|@]|A|$]]|$1|P|3|Q|5|6|7|1A|8|@]|9|@$R|1B|S|1C|1|1D]]|A|$]]|$1|T|3|-4|5|6|7|1E|8|@]|9|@]|A|$]]]|U|$V|$5|W|X|Y|A|$Z|10]]]]

You can use the git-reset command.
<blockquote>
git-reset - Reset current HEAD to the
specified state. git reset [--mixed |
--soft | --hard | --merge] [-q] [] git reset [-q] []
[--] … git reset --patch
[] [--] […]
</blockquote>
<a href="http://git-scm.com/docs/git-reset" rel="nofollow noreferrer">GIT-Reset</a>

blocks|key|180237|text|您应该重置为上一次提交。这应该是可行的：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|180238|git+reset+--hard+HEAD%5E|code-block|syntax|javascript|180239|或者甚至使用HEAD%5E%5E来恢复该恢复提交。如果您不确定应该后退多少步，您可以随时提供完整的SHA参考。|offset|length|style|CODE|180240|如果您有问题，并且您的主分支没有任何本地更改，您可以重置为origin/master。|180241|entityMap^0|0|0|6|6|0|T|D|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@$I|T|J|U|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|V|8|@$I|W|J|X|K|L]]|9|@]|A|$]]|$1|O|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|P|$]]

You should reset to the previous commit. This should work:

<pre><code>git reset --hard HEAD^
</code></pre>

Or even <code>HEAD^^</code> to revert that revert commit. You can always give a full SHA reference if you're not sure how many steps back you should take.

In case when you have problems and your master branch didn't have any local changes, you can reset to <code>origin/master</code>.

blocks|key|2730619|text|使用git+reflog检查哪个提交在合并之前(git+reflog将比git+log更好)。然后，您可以使用以下命令重置它：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2730620|git+reset+--hard+commit_sha|code-block|syntax|javascript|2730621|还有另一种方法：|2730622|git+reset+--hard+HEAD~1|2730623|它将使您返回1次提交。|2730624|请注意，任何已修改和未提交/未存储的文件都将重置为其未修改状态的。保留它们，或者隐藏更改，或者查看下面的--merge选项。|BOLD|2730625|2730626|正如@Velmont在他的回答中所建议的，在这种直接的情况下，使用：|2730627|git+reset+--hard+ORIG_HEAD|2730628|可能会产生更好的结果，因为它应该保留您的更改。在合并发生之前，ORIG_HEAD将直接指向提交，因此您不必自己寻找它。|2730629|2730630|另一个技巧是使用--merge开关而不是--hard开关，因为它不会不必要地重置文件：|2730631|git+reset+--merge+ORIG_HEAD|2730632|2730633|+--合并|blockquote|2730634|2730635|重置索引并更新工作树中与HEAD不同的文件，但保留索引和工作树之间不同的文件(即具有未添加更改的文件)。|2730636|entityMap^0|2|A|O|A|10|7|0|0|0|0|0|0|W|1G|7|0|0|0|0|V|9|0|0|8|7|K|6|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|1E|8|@$9|1F|A|1G|B|C]|$9|1H|A|1I|B|C]|$9|1J|A|1K|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|1L|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|1M|8|@]|D|@]|E|$]]|$1|M|3|N|5|H|7|1N|8|@]|D|@]|E|$I|J]]|$1|O|3|P|5|6|7|1O|8|@]|D|@]|E|$]]|$1|Q|3|R|5|6|7|1P|8|@$9|1Q|A|1R|B|S]|$9|1S|A|1T|B|C]]|D|@]|E|$]]|$1|T|3|-4|5|6|7|1U|8|@]|D|@]|E|$]]|$1|U|3|V|5|6|7|1V|8|@]|D|@]|E|$]]|$1|W|3|X|5|H|7|1W|8|@]|D|@]|E|$I|J]]|$1|Y|3|Z|5|6|7|1X|8|@$9|1Y|A|1Z|B|C]]|D|@]|E|$]]|$1|10|3|-4|5|6|7|20|8|@]|D|@]|E|$]]|$1|11|3|12|5|6|7|21|8|@$9|22|A|23|B|C]|$9|24|A|25|B|C]]|D|@]|E|$]]|$1|13|3|14|5|H|7|26|8|@]|D|@]|E|$I|J]]|$1|15|3|-4|5|6|7|27|8|@]|D|@]|E|$]]|$1|16|3|17|5|18|7|28|8|@]|D|@]|E|$]]|$1|19|3|-4|5|6|7|29|8|@]|D|@]|E|$]]|$1|1A|3|1B|5|6|7|2A|8|@]|D|@]|E|$]]|$1|1C|3|-4|5|6|7|2B|8|@]|D|@]|E|$]]]|1D|$]]

With <code>git reflog</code> check which commit is one prior the merge (<code>git reflog</code> will be a better option than <code>git log</code>). Then you can reset it using:

<pre><code>git reset --hard commit_sha
</code></pre>

There's also another way:

<pre><code>git reset --hard HEAD~1
</code></pre>

It will get you back 1 commit.

Be aware that any modified and uncommitted/unstashed files will be reset to their unmodified state. To keep them either stash changes away or see <code>--merge</code> option below. 

<hr>

As @Velmont suggested below in his answer, in this direct case using:

<pre><code>git reset --hard ORIG_HEAD
</code></pre>

might yield better results, as it should preserve your changes. <code>ORIG_HEAD</code> will point to a commit directly before merge has occurred, so you don't have to hunt for it yourself.

<hr>

A further tip is to use the <code>--merge</code> switch instead of <code>--hard</code> since it doesn't reset files unnecessarily:

<pre><code>git reset --merge ORIG_HEAD
</code></pre>

<blockquote>
 --merge
 
 Resets the index and updates the files in the working tree that are different between &lt;commit&gt; and HEAD, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added). 
</blockquote>

blocks|key|1321989|text|好吧，这里的其他人给我的答案很接近，但它不起作用。这是我所做的。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1321990|这样做..。|1321991|git+reset+--hard+HEAD%5E
git+status|code-block|syntax|javascript|1321992|给我...gave下面的状态。|1321993|#+On+branch+master
#+Your+branch+and+'origin/master'+have+diverged,
#+and+have+3+and+3+different+commit(s)+each,+respectively.|1321994|然后，我不得不多次输入相同的git+reset命令。每次我这样做的时候，消息都会改变一个，你可以在下面看到。|offset|length|style|CODE|1321995|>+git+reset+--hard+HEAD%5E
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%5E
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%5E
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%5E
HEAD+is+now+at+[...truncated...]
>+git+status
#+On+branch+master
#+Your+branch+is+behind+'origin/master'+by+3+commits,+and+can+be+fast-forwarded.|1321996|在这一点上，我看到状态消息发生了变化，所以我尝试执行一个git+pull，这似乎起作用了：|1321997|>+git+pull
Updating+2df6af4..12bbd2f
Fast+forward
+app/views/truncated+%7C++++9+%2B%2B%2B%2B%2B%2B---
+app/views/truncated+%7C+++13+%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B
+app/views/truncated+%7C++++2+%2B-
+3+files+changed,+20+insertions(%2B),+4+deletions(-)
>+git+status
#+On+branch+master|1321998|长话短说，我的命令可以归结为：|1321999|git+reset+--hard+HEAD%5E
git+reset+--hard+HEAD%5E
git+reset+--hard+HEAD%5E
git+reset+--hard+HEAD%5E
git+pull|1322000|entityMap^0|0|0|0|0|0|E|9|0|0|S|8|0|0|0|0^^$0|@$1|2|3|4|5|6|7|14|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|15|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|16|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|17|8|@]|9|@]|A|$]]|$1|K|3|L|5|F|7|18|8|@]|9|@]|A|$G|H]]|$1|M|3|N|5|6|7|19|8|@$O|1A|P|1B|Q|R]]|9|@]|A|$]]|$1|S|3|T|5|F|7|1C|8|@]|9|@]|A|$G|H]]|$1|U|3|V|5|6|7|1D|8|@$O|1E|P|1F|Q|R]]|9|@]|A|$]]|$1|W|3|X|5|F|7|1G|8|@]|9|@]|A|$G|H]]|$1|Y|3|Z|5|6|7|1H|8|@]|9|@]|A|$]]|$1|10|3|11|5|F|7|1I|8|@]|9|@]|A|$G|H]]|$1|12|3|-4|5|6|7|1J|8|@]|9|@]|A|$]]]|13|$]]

Okay, the answers other people here gave me were close, but it didn't work. Here's what I did.

Doing this...

<pre><code>git reset --hard HEAD^
git status
</code></pre>

...gave me the following status.

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

I then had to type in the same <code>git reset</code> command several more times. Each time I did that, the message changed by one as you can see below.

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

At this point, I saw the status message changed, so I tried doing a <code>git pull</code>, and that seemed to work:

<pre><code>&gt; 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(-)
&gt; git status
# On branch master
</code></pre>

So long story short, my commands came down to this:

<pre><code>git reset --hard HEAD^
git reset --hard HEAD^
git reset --hard HEAD^
git reset --hard HEAD^
git pull
</code></pre>

blocks|key|928427|text|我认为您可以执行git+rebase+-i+[hash]+[branch_name]，其中[hash]是标识您想倒带到什么时候的散列加上1(或者您想返回多少个提交)，然后在编辑器中删除您不再需要的提交的行。保存文件。出口。祈祷。它应该重新上线。您可能需要做一个git+reset+--hard，但在这一点上它应该很好。如果您不想将特定的提交保留在您的历史记录中，您还可以使用它将特定的提交从堆栈中拉出，但这可能会使您的存储库处于您可能不想要的状态。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|928428|entityMap^0|8|Y|19|6|3M|G|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]|$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|O|8|@]|D|@]|E|$]]]|G|$]]

I think you can do <code>git rebase -i [hash] [branch_name]</code> where <code>[hash]</code> is the identifying hash for however far back you want to rewind plus one (or however many commits back you want to go) and then delete the lines for the commits in the editor that you don't want any more. Save the file. Exit. Pray. And it should be rewound. You might have to do a <code>git reset --hard</code>, but it should be good at this point. You can also use this to pull specific commits out of a stack, if you don't want to keep them in your history, but that can leave your repository in a state that you probably don't want.

blocks|key|2730729|text|假设您的本地主机不在原始主机/主机之前，您应该能够做到|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2730730|git+reset+--hard+origin/master|code-block|syntax|javascript|2730731|然后，您的本地master分支看起来应该与origin/master相同。|offset|length|style|CODE|2730732|entityMap^0|0|0|7|6|L|D|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@$I|R|J|S|K|L]|$I|T|J|U|K|L]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|N|$]]

Assuming your local master was not ahead of origin/master, you should be able to do

<pre><code>git reset --hard origin/master
</code></pre>

Then your local <code>master</code> branch should look identical to <code>origin/master</code>.

blocks|key|1322089|text|参见chapter+4+in+the+Git+book和the+original+post+by+Linus+Torvalds。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1322090|撤消已推送的合并|1322091|git+revert+-m+1+commit_hash|code-block|syntax|javascript|1322092|如果要再次提交分支，请务必恢复恢复，就像Linus所说的那样。|style|BOLD|1322093|entityMap|0|LINK|mutability|MUTABLE|url|http://git-scm.com/book/en/Git-Basics-Undoing-Things|1|http://opensource.apple.com/source/Git/Git-26/src/git-htmldocs/howto/revert-a-faulty-merge.txt^0|2|P|0|S|Z|1|0|0|0|0|V|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@$A|Z|B|10|1|11]|$A|12|B|13|1|14]]|C|$]]|$1|D|3|E|5|6|7|15|8|@]|9|@]|C|$]]|$1|F|3|G|5|H|7|16|8|@]|9|@]|C|$I|J]]|$1|K|3|L|5|6|7|17|8|@$A|18|B|19|M|N]]|9|@]|C|$]]|$1|O|3|-4|5|6|7|1A|8|@]|9|@]|C|$]]]|P|$Q|$5|R|S|T|C|$U|V]]|W|$5|R|S|T|C|$U|X]]]]

See <a href="http://git-scm.com/book/en/Git-Basics-Undoing-Things" rel="noreferrer">chapter 4 in the Git book</a> and <a href="http://opensource.apple.com/source/Git/Git-26/src/git-htmldocs/howto/revert-a-faulty-merge.txt" rel="noreferrer">the original post by Linus Torvalds</a>.

To undo a merge that was already pushed:

<pre><code>git revert -m 1 commit_hash
</code></pre>

Be sure to revert the revert if you're committing the branch again, like Linus said.

blocks|key|1322125|text|作为一个额外的选择，我主要遵循这里描述的分支模型：http://nvie.com/posts/a-successful-git-branching-model/，因此通常与--no-ff合并(没有快进)。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1322126|我只是阅读这一页，因为我意外地合并了测试分支，而不是我的发布分支和master+for+deploying+(网站，master是实时的)。测试分支还有另外两个合并到它的分支，总共提交了大约六次。|1322127|因此，要恢复整个提交，我只需要一个git+reset+--hard+HEAD%5E，它就恢复了整个合并。由于合并不是快速前进的，所以合并是一个块，后退一步是“分支未合并”。|1322128|entityMap|0|LINK|mutability|MUTABLE|url|http://nvie.com/posts/a-successful-git-branching-model/^0|2E|7|P|1J|0|0|0|H|M|0^^$0|@$1|2|3|4|5|6|7|R|8|@$9|S|A|T|B|C]]|D|@$9|U|A|V|1|W]]|E|$]]|$1|F|3|G|5|6|7|X|8|@]|D|@]|E|$]]|$1|H|3|I|5|6|7|Y|8|@$9|Z|A|10|B|C]]|D|@]|E|$]]|$1|J|3|-4|5|6|7|11|8|@]|D|@]|E|$]]]|K|$L|$5|M|N|O|E|$P|Q]]]]

Just for an extra option to look at, I've been mostly following the branching model described here: <a href="http://nvie.com/posts/a-successful-git-branching-model/" rel="noreferrer">http://nvie.com/posts/a-successful-git-branching-model/</a> and as such have been merging with <code>--no-ff</code> (no fast forward) usually. 

I just read this page as I'd accidentally merged a testing branch instead of my release branch with master for deploying (website, master is what is live). The testing branch has two other branches merged to it and totals about six commits. 

So to revert the whole commit I just needed one <code>git reset --hard HEAD^</code> and it reverted the whole merge. Since the merges weren't fast forwarded the merge was a block and one step back is "branch not merged".

blocks|key|928490|text|如果您的合并和相应的提交尚未推送，您始终可以切换到另一个分支，删除原始分支并重新创建它。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|928491|例如，我不小心将一个开发分支合并到了master中，并想要撤销它。使用以下步骤：|928492|git+checkout+develop
git+branch+-D+master
git+branch+-t+master+origin/master|code-block|syntax|javascript|928493|瞧！Master处于与origin相同的阶段，并且您的错误合并状态被擦除。|928494|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|N|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|O|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|P|8|@]|9|@]|A|$]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

If your merge and the corresponding commits were not pushed yet, you can always switch to another branch, delete the original one and re-create it.

For example, I accidentally merged a develop branch into master and wanted to undo that. Using the following steps:

<pre><code>git checkout develop
git branch -D master
git branch -t master origin/master
</code></pre>

Voila! Master is at the same stage as origin, and your mis-merged state is erased.

blocks|key|180011|text|如果你还没有提交它，你只能使用|type|unstyled|depth|inlineStyleRanges|entityRanges|data|180012|$+git+checkout+-f|code-block|syntax|javascript|180013|它将撤消合并(以及您所做的一切)。|180014|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

If you didn't commit it yet, you can only use

<pre><code>$ git checkout -f
</code></pre>

It will undo the merge (and everything that you did).

blocks|key|925824|text|首先，确保您已提交并将存储库重置为以前的工作状态:+everything.|type|unstyled|depth|inlineStyleRanges|entityRanges|data|925825|Then+|unordered-list-item|925826|：|ordered-list-item|925827|925828|925829|$+git重置f836e4c1fa51524658b9f026eb5efa24afaf3a36|925830|或者使用--hard+(这将删除所有本地的、未提交的更改！)：|offset|length|style|CODE|BOLD|925831|$+git重置f836e4c1fa51524658b9f026eb5efa24afaf3a36+--hard|925832|使用错误合并的commit之前的散列。|925833|检查您希望在前一个正确版本之上重新提交的commits：|925834|925835|$+git日志4c3e23f529b581c3cbe95350e84e66e3cb05704f提交4c3e23f529b581c3cbe95350e84e66e3cb05704f...commit+16b373a96b0a353f7454b141f7aa6f548c979d0a...|925836|Apply+your+right+commit+on+the+right+version+on+the+right+version+of+your+repository+by:|925837|925838|-+By+using+cherry-pick+(the+changes+introduced+by+some+existing+commits)
+git+cherry-pick+ec59ab844cf504e462f011c8cc7e5667ebb2e9c7
-+Or+by+cherry-picking+the+range+of+commits+by:|code-block|syntax|javascript|925839|++++-+First+checking+the+right+changes+before+merging+them:|925840|+git+diff+5216b24822ea1c48069f648449997879bb49c070..4c3e23f529b581c3cbe95350e84e66e3cb05704f|925841|-在合并之前，首先检查正确的更改：|925842|git+cherry-pick+5216b24822ea1c48069f648449997879bb49c070..4c3e23f529b581c3cbe95350e84e66e3cb05704f|925843|其中，这是您已提交的正确提交的范围(不包括错误提交的合并)。|925844|​|925845|925846|entityMap^0|0|0|0|0|0|0|4|6|C|H|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|1O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|1P|8|@]|9|@]|A|$]]|$1|E|3|F|5|G|7|1Q|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|1R|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|1S|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|1T|8|@]|9|@]|A|$]]|$1|L|3|M|5|6|7|1U|8|@$N|1V|O|1W|P|Q]|$N|1X|O|1Y|P|R]]|9|@]|A|$]]|$1|S|3|T|5|6|7|1Z|8|@]|9|@]|A|$]]|$1|U|3|V|5|6|7|20|8|@]|9|@]|A|$]]|$1|W|3|X|5|D|7|21|8|@]|9|@]|A|$]]|$1|Y|3|-4|5|6|7|22|8|@]|9|@]|A|$]]|$1|Z|3|10|5|6|7|23|8|@]|9|@]|A|$]]|$1|11|3|12|5|D|7|24|8|@]|9|@]|A|$]]|$1|13|3|-4|5|6|7|25|8|@]|9|@]|A|$]]|$1|14|3|15|5|16|7|26|8|@]|9|@]|A|$17|18]]|$1|19|3|1A|5|16|7|27|8|@]|9|@]|A|$17|18]]|$1|1B|3|1C|5|6|7|28|8|@]|9|@]|A|$]]|$1|1D|3|1E|5|6|7|29|8|@]|9|@]|A|$]]|$1|1F|3|1G|5|6|7|2A|8|@]|9|@]|A|$]]|$1|1H|3|1I|5|6|7|2B|8|@]|9|@]|A|$]]|$1|1J|3|1K|5|6|7|2C|8|@]|9|@]|A|$]]|$1|1L|3|1K|5|6|7|2D|8|@]|9|@]|A|$]]|$1|1M|3|-4|5|6|7|2E|8|@]|9|@]|A|$]]]|1N|$]]

<ol>
<li>First, make sure that you've committed everything.</li>
<li>Then reset your repository to the previous working state:

<pre><code>$ git reset f836e4c1fa51524658b9f026eb5efa24afaf3a36
</code></pre>

or using <code>--hard</code> (this will remove all local, not committed changes!):

<pre><code>$ git reset f836e4c1fa51524658b9f026eb5efa24afaf3a36 --hard
</code></pre>

Use the hash which was there before your wrongly merged commit.</li>
<li>Check which commits you'd like to re-commit on the top of the previous correct version by:

<pre><code>$ git log 4c3e23f529b581c3cbe95350e84e66e3cb05704f

commit 4c3e23f529b581c3cbe95350e84e66e3cb05704f

...

commit 16b373a96b0a353f7454b141f7aa6f548c979d0a

...
</code></pre></li>
<li>Apply your right commits on the top of the right version of your repository by:

<ul>
<li>By using cherry-pick (the changes introduced by some existing commits)

<pre><code> git cherry-pick ec59ab844cf504e462f011c8cc7e5667ebb2e9c7
</code></pre></li>
<li>Or by cherry-picking the range of commits by:

<ul>
<li>First checking the right changes before merging them:

<pre><code>git diff 5216b24822ea1c48069f648449997879bb49c070..4c3e23f529b581c3cbe95350e84e66e3cb05704f
</code></pre></li>
<li>First checking the right changes before merging them:

<pre><code>git cherry-pick 5216b24822ea1c48069f648449997879bb49c070..4c3e23f529b581c3cbe95350e84e66e3cb05704f
</code></pre>

where this is the range of the correct commits which you've committed (excluding wrongly committed merge).</li>
</ul></li>
</ul></li>
</ol>

blocks|key|925874|text|奇怪的是，最简单的命令却不见了。大多数答案都有效，但是撤销你刚刚做的合并，这是简单安全的方法|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|925875|git+reset+--merge+ORIG_HEAD|code-block|syntax|javascript|925876|引用ORIG_HEAD将指向合并之前的原始提交。|CODE|925877|(+--merge选项与合并无关。它就像git+reset+--hard+ORIG_HEAD一样，但更安全，因为它不会触及未提交的更改。)|925878|entityMap^0|11|7|0|0|2|9|0|2|7|K|Q|0^^$0|@$1|2|3|4|5|6|7|R|8|@$9|S|A|T|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|U|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|V|8|@$9|W|A|X|B|M]]|D|@]|E|$]]|$1|N|3|O|5|6|7|Y|8|@$9|Z|A|10|B|M]|$9|11|A|12|B|M]]|D|@]|E|$]]|$1|P|3|-4|5|6|7|13|8|@]|D|@]|E|$]]]|Q|$]]

It is strange that the simplest command was missing. Most answers work, but undoing the merge you just did, this is the easy and safe way:

<pre><code>git reset --merge ORIG_HEAD
</code></pre>

The ref <code>ORIG_HEAD</code> will point to the original commit from before the merge.

(The <code>--merge</code> option has nothing to do with the merge. It's just like <code>git reset --hard ORIG_HEAD</code>, but safer since it doesn't touch uncommitted changes.)

blocks|key|925898|text|对于较新的Git版本，如果您还没有提交合并，并且存在合并冲突，您可以简单地执行以下操作：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|925899|git+merge+--abort|code-block|syntax|javascript|925900|来自man+git+merge|offset|length|style|CODE|925901|925902|这只能在合并导致冲突之后运行。git+merge+--abort将中止合并过程，并尝试重建预合并状态。|blockquote|925903|925904|entityMap^0|0|0|2|D|0|0|F|H|0|0^^$0|@$1|2|3|4|5|6|7|T|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|U|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|V|8|@$I|W|J|X|K|L]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|N|3|O|5|P|7|Z|8|@$I|10|J|11|K|L]]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|12|8|@]|9|@]|A|$]]|$1|R|3|-4|5|6|7|13|8|@]|9|@]|A|$]]]|S|$]]

With newer Git versions, if you have not committed the merge yet and you have a merge conflict, you can simply do:

<pre><code>git merge --abort
</code></pre>

From <code>man git merge</code>:

<blockquote>
 [This] can only be run after the merge has resulted in conflicts. <code>git merge --abort</code> will abort the merge process and try to reconstruct the pre-merge state.
</blockquote>

blocks|key|2731159|text|如果您想要一个命令行解决方案，我建议使用MBO的答案。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2731160|如果你是新手，你可能会喜欢图形化的方法：|2731161|2731162|启动gitk+(从命令行，或者在文件浏览器中右键单击，如果有)|ordered-list-item|offset|length|style|CODE|2731163|您可以很容易地找到合并提交-从顶部开始的第一个节点，有两个父节点|2731164|沿着链接到第一个/左边的父节点(合并前当前分支上的那个，通常是红色的)|2731165|在选定的提交上，右键单击“将分支重置到此处”，在那里选择硬重置<代码>H29<代码>G210|2731166|2731167|entityMap^0|0|0|0|2|4|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|U|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|V|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|W|8|@]|9|@]|A|$]]|$1|E|3|F|5|G|7|X|8|@$H|Y|I|Z|J|K]]|9|@]|A|$]]|$1|L|3|M|5|G|7|10|8|@]|9|@]|A|$]]|$1|N|3|O|5|G|7|11|8|@]|9|@]|A|$]]|$1|P|3|Q|5|G|7|12|8|@]|9|@]|A|$]]|$1|R|3|-4|5|6|7|13|8|@]|9|@]|A|$]]|$1|S|3|-4|5|6|7|14|8|@]|9|@]|A|$]]]|T|$]]

If you want a command-line solution, I suggest to just go with MBO's answer.

If you're a newbie, you might like the graphical approach:

<ol>
<li>Kick off <code>gitk</code> (from the command line, or right click in file browser if you have that)</li>
<li>You can easily spot the merge commit there - the first node from the top with two parents</li>
<li>Follow the link to the first/left parent (the one on your current branch before the merge, usually red for me)</li>
<li>On the selected commit, right-click "Reset branch to here", pick the hard reset there</li>
</ol>

blocks|key|925926|text|您可以使用git+reflog查找以前的结帐。有时，这是一种您想要返回的良好状态。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|925927|具体来说，|925928|$+git+reflog
$+git+reset+--hard+HEAD@{0}|code-block|syntax|javascript|925929|entityMap^0|5|A|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@$9|P|A|Q|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|R|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|S|8|@]|D|@]|E|$K|L]]|$1|M|3|-4|5|6|7|T|8|@]|D|@]|E|$]]]|N|$]]

You could use <code>git reflog</code> to find the previous checkout. Sometimes that's a good state you want to return back to.

Concretely,

<pre><code>$ git reflog
$ git reset --hard HEAD@{0}
</code></pre>

blocks|key|180161|text|您只能使用两个命令通过特定的提交还原合并或重新启动：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|180162|180163|git+reset+--hard+commitHash+(你应该使用你想要重新启动的提交，例如.44a587491e32eafa1638aca7738)|ordered-list-item|offset|length|style|CODE|180164|git+push+origin+HEAD+--force+(向origin/master)|180165|发送新的本地主分支|180166|祝你好运，继续前进！|180167|entityMap^0|0|0|0|R|0|0|S|0|0|0^^$0|@$1|2|3|4|5|6|7|R|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|S|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|T|8|@$F|U|G|V|H|I]]|9|@]|A|$]]|$1|J|3|K|5|E|7|W|8|@$F|X|G|Y|H|I]]|9|@]|A|$]]|$1|L|3|M|5|6|7|Z|8|@]|9|@]|A|$]]|$1|N|3|O|5|6|7|10|8|@]|9|@]|A|$]]|$1|P|3|-4|5|6|7|11|8|@]|9|@]|A|$]]]|Q|$]]

You can use only two commands to revert a merge or restart by a specific commit:

<ol>
<li><code>git reset --hard commitHash</code> (you should use the commit that you want to restart, eg. 44a587491e32eafa1638aca7738)</li>
<li><code>git push origin HEAD --force</code> (Sending the new local master branch to origin/master)</li>
</ol>

Good luck and go ahead!

blocks|key|1322541|text|最近，我一直在使用git+reflog来帮助解决这个问题。只有当合并刚刚发生，并且它在你的机器上时，这才能起作用。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1322542|git+reflog可能会返回如下内容：|1322543|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%5E
8400a0f+HEAD@{5}:+rebase:+aborting|code-block|syntax|javascript|1322544|第一行表示发生了合并。第二行是合并之前的时间。我简单地使用git+reset+--hard+43b6032来强制这个分支在合并之前跟踪，并继续。|1322545|entityMap^0|9|A|0|0|A|0|0|T|O|0^^$0|@$1|2|3|4|5|6|7|Q|8|@$9|R|A|S|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|T|8|@$9|U|A|V|B|C]]|D|@]|E|$]]|$1|H|3|I|5|J|7|W|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|X|8|@$9|Y|A|Z|B|C]]|D|@]|E|$]]|$1|O|3|-4|5|6|7|10|8|@]|D|@]|E|$]]]|P|$]]

Lately, I've been using <code>git reflog</code> to help with this. This mostly only works if the merge JUST happened, and it was on your machine. 

<code>git reflog</code> might return something like:

<pre><code>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
</code></pre>

The first line indicates that a merge occurred. The 2nd line is the time before my merge. I simply <code>git reset --hard 43b6032</code> to force this branch to track from before the merge, and carry-on.

blocks|key|928685|text|使用现代的Git，您可以：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|928686|git+merge+--abort|code-block|syntax|javascript|928687|较旧的语法：|928688|git+reset+--merge|928689|老式的：|928690|git+reset+--hard|928691|但实际上，值得注意的是，git+merge+--abort只有在存在git+reset+--merge的情况下才等同于MERGE_HEAD。这可以在合并命令的Git帮助中读取。|offset|length|style|CODE|928692|git+merge+--abort+is+equivalent+to+git+reset+--merge+when+MERGE_HEAD+is+present.|928693|在失败的合并之后，当没有MERGE_HEAD时，可以使用git+reset+--merge撤消失败的合并，但不一定使用git+merge+--abort和，因此它们不仅是同一事物的新旧语法。|BOLD|928694|就我个人而言，我发现git+reset+--merge在日常工作中更加强大和有用，所以我一直在使用它。|928695|entityMap^0|0|0|0|0|0|0|C|H|Y|H|1N|A|0|0|C|A|S|H|1N|H|25|C|0|A|H|0^^$0|@$1|2|3|4|5|6|7|13|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|14|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|15|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|16|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|17|8|@]|9|@]|A|$]]|$1|M|3|N|5|D|7|18|8|@]|9|@]|A|$E|F]]|$1|O|3|P|5|6|7|19|8|@$Q|1A|R|1B|S|T]|$Q|1C|R|1D|S|T]|$Q|1E|R|1F|S|T]]|9|@]|A|$]]|$1|U|3|V|5|D|7|1G|8|@]|9|@]|A|$E|F]]|$1|W|3|X|5|6|7|1H|8|@$Q|1I|R|1J|S|T]|$Q|1K|R|1L|S|T]|$Q|1M|R|1N|S|T]|$Q|1O|R|1P|S|Y]]|9|@]|A|$]]|$1|Z|3|10|5|6|7|1Q|8|@$Q|1R|R|1S|S|T]]|9|@]|A|$]]|$1|11|3|-4|5|6|7|1T|8|@]|9|@]|A|$]]]|12|$]]

With modern Git, you can:

<pre><code>git merge --abort
</code></pre>

Older syntax:

<pre><code>git reset --merge
</code></pre>

Old-school:

<pre><code>git reset --hard
</code></pre>

But actually, it is worth noticing that <code>git merge --abort</code> is only equivalent to <code>git reset --merge</code> given that <code>MERGE_HEAD</code> is present. This can be read in the Git help for merge command.

<pre><code>git merge --abort is equivalent to git reset --merge when MERGE_HEAD is present.
</code></pre>

After a failed merge, when there is no <code>MERGE_HEAD</code>, the failed merge can be undone with <code>git reset --merge</code>, but not necessarily with <code>git merge --abort</code>, so they are not only old and new syntax for the same thing.

Personally I find <code>git reset --merge</code> much more powerful and useful in everyday work, so that's the one I always use.

blocks|key|1322646|text|策略：在一切正常的地方创建一个新的分支。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|1322647|原理：恢复合并是很困难的。有太多的解决方案，这取决于许多因素，例如您是否已经提交或推送了合并，或者合并后是否有新的提交。此外，您还需要对git有相对深入的了解，才能使这些解决方案适合您的情况。如果你盲目地遵循一些指令，你可能会得到一个“空合并”，其中没有任何东西将被合并，并且进一步的合并尝试将使Git告诉你“已经是最新的”。|1322648|解决方案：|1322649|假设您想将dev合并到feature-1中。|CODE|1322650|1322651|查找要接收合并的修订：|ordered-list-item|1322652|1322653|git日志--oneline+-1+a1b2c3d4合并分支'dev‘to+'+feature-1’<--要在零点模块中撤消e5f6g7h8修复NPE的合并<--在合并之前，您可能希望这一个|1322654|检查它(返回时间)：|unordered-list-item|1322655|1322656|git+checkout+e5f6g7h8|1322657|Create从那里创建一个新的分支，并检查它：|1322658|1322659|+checkout+-b功能-1\f25+git+-1\f6|1322660|现在，您可以重新启动合并：|1322661|如果您对结果感到满意，请删除旧的分支：git+merge+dev|1322662|Fix+conflicts.|1322663|
|1322664|Commit：git+commit|1322665|1322666|When：git+branch+--delete+feature-1|1322667|
：|1322668|+merge|1322669|1322670|entityMap^0|0|3|0|0|3|0|0|5|0|5|3|B|9|0|0|0|0|0|0|0|0|0|0|0|0|J|D|0|0|0|7|A|0|0|5|T|0|0|0|0^^$0|@$1|2|3|4|5|6|7|1O|8|@$9|1P|A|1Q|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|1R|8|@$9|1S|A|1T|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|1U|8|@$9|1V|A|1W|B|C]]|D|@]|E|$]]|$1|J|3|K|5|6|7|1X|8|@$9|1Y|A|1Z|B|L]|$9|20|A|21|B|L]]|D|@]|E|$]]|$1|M|3|-4|5|6|7|22|8|@]|D|@]|E|$]]|$1|N|3|O|5|P|7|23|8|@]|D|@]|E|$]]|$1|Q|3|-4|5|6|7|24|8|@]|D|@]|E|$]]|$1|R|3|S|5|6|7|25|8|@]|D|@]|E|$]]|$1|T|3|U|5|V|7|26|8|@]|D|@]|E|$]]|$1|W|3|-4|5|6|7|27|8|@]|D|@]|E|$]]|$1|X|3|Y|5|6|7|28|8|@]|D|@]|E|$]]|$1|Z|3|10|5|V|7|29|8|@]|D|@]|E|$]]|$1|11|3|-4|5|6|7|2A|8|@]|D|@]|E|$]]|$1|12|3|13|5|6|7|2B|8|@]|D|@]|E|$]]|$1|14|3|15|5|6|7|2C|8|@]|D|@]|E|$]]|$1|16|3|17|5|6|7|2D|8|@$9|2E|A|2F|B|L]]|D|@]|E|$]]|$1|18|3|19|5|V|7|2G|8|@]|D|@]|E|$]]|$1|1A|3|1B|5|6|7|2H|8|@]|D|@]|E|$]]|$1|1C|3|1D|5|V|7|2I|8|@$9|2J|A|2K|B|L]]|D|@]|E|$]]|$1|1E|3|1B|5|6|7|2L|8|@]|D|@]|E|$]]|$1|1F|3|1G|5|V|7|2M|8|@$9|2N|A|2O|B|L]]|D|@]|E|$]]|$1|1H|3|1I|5|6|7|2P|8|@]|D|@]|E|$]]|$1|1J|3|1K|5|P|7|2Q|8|@]|D|@]|E|$]]|$1|1L|3|-4|5|6|7|2R|8|@]|D|@]|E|$]]|$1|1M|3|-4|5|6|7|2S|8|@]|D|@]|E|$]]]|1N|$]]

Strategy: Create a new branch from where everything was good.

Rationale: Reverting a merge is hard. There are too many solutions, depending on many factors such as whether you've committed or pushed your merge or if there were new commits since your merge. Also you still need to have a relatively deep understanding of git to adapt these solutions to your case. If you blindly follow some instructions, you can end up with an "empty merge" where nothing will be merged, and further merge attempts will make Git tell you "Already up to date".

Solution:

Let's say you want to merge <code>dev</code> into <code>feature-1</code>.

<ol>
<li>Find the revision that you want to receive the merge:

<pre><code>git log --oneline feature-1
a1b2c3d4 Merge branch 'dev' into 'feature-1' &lt;-- the merge you want to undo
e5f6g7h8 Fix NPE in the Zero Point Module &lt;-- the one before the merge, you probably want this one
</code></pre></li>
<li>Check it out (go back in time):

<pre><code>git checkout e5f6g7h8
</code></pre></li>
<li>Create a new branch from there and check it out:

<pre><code>git checkout -b feature-1
</code></pre></li>
</ol>

Now you can restart your merge:

<ol>
<li>Merge: <code>git merge dev</code></li>
<li>Fix your merge conflicts.</li>
<li>Commit: <code>git commit</code></li>
<li>When you're satisfied with the results, delete the old branch: <code>git branch --delete feature-1</code></li>
</ol>

blocks|key|928725|text|如果您注意到需要在合并之后立即恢复，并且在尝试合并之后没有执行任何其他操作，则可以发出以下命令：git+reset+--hard+HEAD@{1}。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|928726|本质上，如果在合并之后没有提交任何其他内容，则合并sha将指向HEAD@{0}，因此HEAD@{1}将是合并之前的点。|928727|entityMap^0|1C|P|0|P|3|V|8|16|8|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|M|8|@$9|N|A|O|B|C]|$9|P|A|Q|B|C]|$9|R|A|S|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|6|7|T|8|@]|D|@]|E|$]]]|I|$]]

If you notice that you need to revert immediately after the merge and you haven't done anything else after the merge attempt, you can just issue this command:
<code>git reset --hard HEAD@{1}</code>.

Essentially, your merge <code>sha</code> will be pointing to <code>HEAD@{0}</code> if nothing else was committed after the merge and so <code>HEAD@{1}</code> will be the previous point before the merge.

blocks|key|1322733|text|最简单的机会，比这里说的任何事情都简单得多：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1322734|删除您的本地分支(本地分支，而不是远程分支)，然后再次拉取它。这样，您将撤消主分支上的更改，并且任何人都将受到您不想推送的更改的影响。从头开始。|1322735|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

The simplest of the simplest chance, much simpler than anything said here:

Remove your local branch (local, not remote) and pull it again. This way you'll undo the changes on your master branch and anyone will be affected by the change you don't want to push. Start it over.

blocks|key|926064|text|如果您提交了合并：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|926065|git+reset+HEAD~1
#+Make+sure+what+you+are+reverting+is+in+fact+the+merge+files
git+add+.
git+reset+--hard|code-block|syntax|javascript|926066|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

If you committed the merge:

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

blocks|key|1322770|text|这个问题也是希望恢复到匹配原点(即，在原点之前没有提交)。进一步的研究，发现有一个reset命令可以做到这一点：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1322771|git+reset+--hard+@{u}|1322772|注意：@{u}是origin/master的缩写。(当然，您还需要远程存储库才能正常工作。)|1322773|entityMap^0|15|5|0|0|L|0|3|4|8|D|0^^$0|@$1|2|3|4|5|6|7|L|8|@$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|O|8|@$9|P|A|Q|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|R|8|@$9|S|A|T|B|C]|$9|U|A|V|B|C]]|D|@]|E|$]]|$1|J|3|-4|5|6|7|W|8|@]|D|@]|E|$]]]|K|$]]

Got to this question also looking to revert to match origin (ie, NO commits ahead of origin). Researching further, found there's a <code>reset</code> command for exactly that:

<code>git reset --hard @{u}</code>

Note: <code>@{u}</code> is shorthand for <code>origin/master</code>. (And, of course, you need that remote repository for this to work.)

blocks|key|1322832|text|最简单的答案是odinho+-+Velmont给出的答案。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1322833|先做git+reset+--merge+ORIG_HEAD|offset|length|style|CODE|1322834|对于那些希望在更改被推送后重置的人，可以这样做(因为这是第一个看到任何git重置合并问题的帖子)|1322835|git+push+origin+HEAD+--force|1322836|这将以一种方式重置，您将不会在pull之后再次获得合并的更改。|1322837|entityMap^0|0|2|R|0|0|0|S|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Q|8|@$D|R|E|S|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|T|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|U|8|@$D|V|E|W|F|G]]|9|@]|A|$]]|$1|L|3|M|5|6|7|X|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|O|$]]

The simplest answer is the one given by odinho - Velmont

First do <code>git reset --merge ORIG_HEAD</code>

For those looking to reset after changes are pushed, do this
(Because this is the first post seen for any git reset merge questions)

<code>git push origin HEAD --force</code>

This will reset in a way that you won't get the merged changes back again after pull.

blocks|key|1322872|text|在这种情况下，您需要使用git+reset+--hard+<branch_name>重置分支。如果您想在重置更改之前保存更改，请确保创建一个新的分支和git+checkout+<branch_name>。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1322873|您也可以使用git+reset+--hard+<commit_id>将状态重置为特定的提交。|1322874|如果更改已被推送，则可以使用git+revert+<branch_name>。请务必了解如何在其他场景中使用git+revert+and+git+checkout。|1322875|entityMap|0|LINK|mutability|MUTABLE|url|https://kolosek.com/git-reset-revert-and-checkout/^0|C|U|23|Q|0|6|S|0|E|O|1I|R|0|0^^$0|@$1|2|3|4|5|6|7|R|8|@$9|S|A|T|B|C]|$9|U|A|V|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|W|8|@$9|X|A|Y|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|Z|8|@$9|10|A|11|B|C]]|D|@$9|12|A|13|1|14]]|E|$]]|$1|J|3|-4|5|6|7|15|8|@]|D|@]|E|$]]]|K|$L|$5|M|N|O|E|$P|Q]]]]

In this case, you will want to reset your branch with <code>git reset --hard &lt;branch_name&gt;</code>. If you want to save your changes before reseting them be sure to create a new branch and <code>git checkout &lt;branch_name&gt;</code>.

You can reset the state to a specific commit with <code>git reset --hard &lt;commit_id&gt;</code> as well.

If the changes have been pushed you can use <code>git revert &lt;branch_name&gt;</code> instead. Be sure to check out how to use <a href="https://kolosek.com/git-reset-revert-and-checkout/" rel="nofollow noreferrer">git revert and git checkout</a> in other scenarios as well.

blocks|key|926157|text|我能够通过一个不涉及查找提交id的命令来解决这个问题。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|926158|git+reset+--hard+remotes/origin/HEAD|code-block|syntax|javascript|926159|被接受的答案对我不起作用，但这个命令达到了我想要的结果。|926160|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

I was able to resolve this problem with a single command that doesn't involve looking up a commit id.

<pre><code>git reset --hard remotes/origin/HEAD
</code></pre>

The accepted answer didn't work for me but this command achieved the results I was looking for.

blocks|key|1322957|text|如果您正在进行合并，则可以随时中止合并|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1322958|git+merge+--abort|code-block|syntax|javascript|1322959|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

If you are in a middle of merging you can always abort it
<pre><code>git merge --abort
</code></pre>

blocks|key|180366|text|type|unstyled|depth|inlineStyleRanges|entityRanges|data|180367|git+stash|ordered-list-item|offset|length|style|CODE|180368|git+branch+-d+the_local_branch|180369|git+checkout+-t+<name+of+remote>|180370|git+stash+apply|180371|180372|这对我很有效..！！|180373|entityMap^0|0|0|9|0|0|U|0|0|W|0|0|F|0|0|0^^$0|@$1|2|3|-4|4|5|6|S|7|@]|8|@]|9|$]]|$1|A|3|B|4|C|6|T|7|@$D|U|E|V|F|G]]|8|@]|9|$]]|$1|H|3|I|4|C|6|W|7|@$D|X|E|Y|F|G]]|8|@]|9|$]]|$1|J|3|K|4|C|6|Z|7|@$D|10|E|11|F|G]]|8|@]|9|$]]|$1|L|3|M|4|C|6|12|7|@$D|13|E|14|F|G]]|8|@]|9|$]]|$1|N|3|-4|4|5|6|15|7|@]|8|@]|9|$]]|$1|O|3|P|4|5|6|16|7|@]|8|@]|9|$]]|$1|Q|3|-4|4|5|6|17|7|@]|8|@]|9|$]]]|R|$]]

<ol>
<li><code>git stash</code></li>
<li><code>git branch -d the_local_branch</code></li>
<li><code>git checkout -t &lt;name of remote&gt;</code></li>
<li><code>git stash apply</code></li>
</ol>

This worked for me..!!

blocks|key|2731664|text|它可以通过多种方式来完成。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2731665|1)中止合并|offset|length|style|BOLD|2731666|如果您处于错误的合并(错误地处理了错误的分支)之间，并且想要避免合并以返回到最新的分支，如下所示：|2731667|git+merge+--abort|code-block|syntax|javascript|2731668|2)将报头重置为远程分支|2731669|如果您是在远程开发分支中工作，则可以将HEAD重置为远程分支上的最后一次提交，如下所示：|2731670|git+reset+--hard+origin/develop|2731671|3)删除当前分支，从远程仓库重新签出|2731672|考虑到您正在使用本地存储库中的开发分支，该分支与远程/开发分支同步，您可以执行以下操作：|2731673|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|2731674|entityMap^0|0|0|6|0|0|0|0|C|0|0|0|0|E|0|0|0^^$0|@$1|2|3|4|5|6|7|12|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|13|8|@$D|14|E|15|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|16|8|@]|9|@]|A|$]]|$1|J|3|K|5|L|7|17|8|@]|9|@]|A|$M|N]]|$1|O|3|P|5|6|7|18|8|@$D|19|E|1A|F|G]]|9|@]|A|$]]|$1|Q|3|R|5|6|7|1B|8|@]|9|@]|A|$]]|$1|S|3|T|5|L|7|1C|8|@]|9|@]|A|$M|N]]|$1|U|3|V|5|6|7|1D|8|@$D|1E|E|1F|F|G]]|9|@]|A|$]]|$1|W|3|X|5|6|7|1G|8|@]|9|@]|A|$]]|$1|Y|3|Z|5|L|7|1H|8|@]|9|@]|A|$M|N]]|$1|10|3|-4|5|6|7|1I|8|@]|9|@]|A|$]]]|11|$]]

It can be done multiple ways. 

1) Abort Merge

If you are in-between a bad merge (mistakenly done with wrong branch), and wanted to avoid the merge to go back to the branch latest as below:

<pre><code>git merge --abort
</code></pre>

2) Reset HEAD to remote branch

If you are working from remote develop branch, you can reset HEAD to the last commit on remote branch as below:

<pre><code>git reset --hard origin/develop
</code></pre>

3) Delete current branch, and checkout again from the remote repository

Considering, you are working on develop branch in local repo, that syncs with remote/develop branch, you can do as below:

<pre><code>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
</code></pre>

blocks|key|1323179|text|你必须改变你的想法，当然不是你的，而是的头……|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|1323180|因此，在回答之前，让我们添加一些背景知识，解释一下这是什么HEAD。|CODE|1323181|First+of+all+what+is+HEAD?|1323182|HEAD只是对当前分支上的当前提交(最新)的引用。|1323183|在任何给定时间只能有一个HEAD。(不包括git+worktree)|1323184|HEAD的内容存储在.git/HEAD中，它包含当前提交的40个字节的SHA-1。|1323185|1323186|detached+HEAD|1323187|如果您没有执行最近一次提交-意味着HEAD指向历史上的前一次提交，那么它被称为detached+HEAD.|1323188|​|1323189|📷|atomic|1323190|1323191|在命令行上，它将类似于-+SHA-1而不是分支名称，因为HEAD没有指向当前分支的顶端|1323192|1323193|1323194|1323195|1323196|1323197|1323198|关于如何从分离的头部恢复的几个选项：|1323199|1323200|git+checkout|1323201|git+checkout+<commit_id>
git+checkout+-b+<new+branch>+<commit_id>
git+checkout+HEAD~X+//+x+is+the+number+of+commits+t+go+back|code-block|syntax|javascript|1323202|这将签出指向所需提交的新分支。|1323203|此命令将签出到给定的提交。|1323204|此时，您可以创建一个分支并从此点开始工作。|1323205|#+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>|1323206|1323207|git+reflog|1323208|您也可以随时使用reflog。|1323209|git+reflog将显示更新了HEAD的任何更改，并且检出所需的reflog条目会将HEAD设置回此提交。|1323210|每次修改reflog头时，+HEAD中都会有一个新条目|1323211|git+reflog
git+checkout+HEAD@{...}|1323212|这将使您返回到所需的提交|1323213|1323214|1323215|1323216|1323217|1323218|“移动”你的头回到你想要的提交。|1323219|#+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.|1323220|1323221|注释：(Since+Git+2.7)|unordered-list-item|1323222|1323223|您也可以使用git+rebase+--no-autostash。|1323224|1323225|1323226|“撤消”给定的提交或提交范围。|1323227|reset命令将“撤消”在给定提交中所做的任何更改。|1323228|带有撤消补丁的新提交将被提交，而原始提交也将保留在历史中。|1323229|#+add+new+commit+with+the+undo+of+the+original+one.
#+the+<sha-1>+can+be+any+commit(s)+or+commit+range
git+revert+<sha-1>|1323230|1323231|这个模式说明了哪个命令做了什么。|1323232|如您所见，reset+&&+checkout修改HEAD。|1323233|1323234|1323235|1323236|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://i.stack.imgur.com/OlavO.png|imageAlt|1|https://i.stack.imgur.com/qplvo.png|2|https://i.stack.imgur.com/U0l3s.png|3|LINK|MUTABLE|url|https://git-scm.com/docs/git-checkout|4|https://git-scm.com/docs/git-reflog|5|https://i.stack.imgur.com/atW9w.png|6|https://github.com/git/git/blob/master/Documentation/RelNotes/2.7.0.txt|7|https://i.stack.imgur.com/NuThL.png^0|J|4|0|T|4|0|0|Q|0|Q|0|0|4|0|C|4|L|C|0|0|4|A|9|0|0|0|D|0|D|0|H|4|13|D|13|D|0|0|0|1|0|0|0|S|4|0|0|0|1|1|0|0|0|0|1|2|0|0|0|0|0|C|0|C|3|0|0|0|0|0|0|0|0|A|0|A|4|0|8|6|0|0|A|G|4|17|4|0|0|D|4|6|0|0|0|0|0|1|5|0|0|0|0|0|0|0|4|D|6|0|0|6|P|0|0|0|0|0|0|0|0|0|5|H|O|4|0|0|0|1|7|0|0^^$0|@$1|2|3|4|5|6|7|3S|8|@$9|3T|A|3U|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|3V|8|@$9|3W|A|3X|B|H]]|D|@]|E|$]]|$1|I|3|J|5|6|7|3Y|8|@$9|3Z|A|40|B|C]|$9|41|A|42|B|H]]|D|@]|E|$]]|$1|K|3|L|5|6|7|43|8|@$9|44|A|45|B|H]]|D|@]|E|$]]|$1|M|3|N|5|6|7|46|8|@$9|47|A|48|B|H]|$9|49|A|4A|B|H]]|D|@]|E|$]]|$1|O|3|P|5|6|7|4B|8|@$9|4C|A|4D|B|H]|$9|4E|A|4F|B|H]]|D|@]|E|$]]|$1|Q|3|-4|5|6|7|4G|8|@]|D|@]|E|$]]|$1|R|3|S|5|6|7|4H|8|@$9|4I|A|4J|B|C]|$9|4K|A|4L|B|H]]|D|@]|E|$]]|$1|T|3|U|5|6|7|4M|8|@$9|4N|A|4O|B|H]|$9|4P|A|4Q|B|H]|$9|4R|A|4S|B|C]]|D|@]|E|$]]|$1|V|3|W|5|6|7|4T|8|@]|D|@]|E|$]]|$1|X|3|Y|5|Z|7|4U|8|@]|D|@$9|4V|A|4W|1|4X]]|E|$]]|$1|10|3|W|5|6|7|4Y|8|@]|D|@]|E|$]]|$1|11|3|12|5|6|7|4Z|8|@$9|50|A|51|B|H]]|D|@]|E|$]]|$1|13|3|W|5|6|7|52|8|@]|D|@]|E|$]]|$1|14|3|Y|5|Z|7|53|8|@]|D|@$9|54|A|55|1|56]]|E|$]]|$1|15|3|W|5|6|7|57|8|@]|D|@]|E|$]]|$1|16|3|W|5|6|7|58|8|@]|D|@]|E|$]]|$1|17|3|Y|5|Z|7|59|8|@]|D|@$9|5A|A|5B|1|5C]]|E|$]]|$1|18|3|W|5|6|7|5D|8|@]|D|@]|E|$]]|$1|19|3|1A|5|6|7|5E|8|@]|D|@]|E|$]]|$1|1B|3|-4|5|6|7|5F|8|@]|D|@]|E|$]]|$1|1C|3|1D|5|6|7|5G|8|@$9|5H|A|5I|B|H]]|D|@$9|5J|A|5K|1|5L]]|E|$]]|$1|1E|3|1F|5|1G|7|5M|8|@]|D|@]|E|$1H|1I]]|$1|1J|3|1K|5|6|7|5N|8|@]|D|@]|E|$]]|$1|1L|3|1M|5|6|7|5O|8|@]|D|@]|E|$]]|$1|1N|3|1O|5|6|7|5P|8|@]|D|@]|E|$]]|$1|1P|3|1Q|5|1G|7|5Q|8|@]|D|@]|E|$1H|1I]]|$1|1R|3|-4|5|6|7|5R|8|@]|D|@]|E|$]]|$1|1S|3|1T|5|6|7|5S|8|@$9|5T|A|5U|B|H]]|D|@$9|5V|A|5W|1|5X]]|E|$]]|$1|1U|3|1V|5|6|7|5Y|8|@$9|5Z|A|60|B|H]]|D|@]|E|$]]|$1|1W|3|1X|5|6|7|61|8|@$9|62|A|63|B|H]|$9|64|A|65|B|H]|$9|66|A|67|B|H]]|D|@]|E|$]]|$1|1Y|3|1Z|5|6|7|68|8|@$9|69|A|6A|B|C]|$9|6B|A|6C|B|H]]|D|@]|E|$]]|$1|20|3|21|5|1G|7|6D|8|@]|D|@]|E|$1H|1I]]|$1|22|3|23|5|6|7|6E|8|@]|D|@]|E|$]]|$1|24|3|W|5|6|7|6F|8|@]|D|@]|E|$]]|$1|25|3|Y|5|Z|7|6G|8|@]|D|@$9|6H|A|6I|1|6J]]|E|$]]|$1|26|3|W|5|6|7|6K|8|@]|D|@]|E|$]]|$1|27|3|-4|5|6|7|6L|8|@]|D|@]|E|$]]|$1|28|3|-4|5|6|7|6M|8|@]|D|@]|E|$]]|$1|29|3|2A|5|6|7|6N|8|@]|D|@]|E|$]]|$1|2B|3|2C|5|1G|7|6O|8|@]|D|@]|E|$1H|1I]]|$1|2D|3|-4|5|6|7|6P|8|@]|D|@]|E|$]]|$1|2E|3|2F|5|2G|7|6Q|8|@]|D|@$9|6R|A|6S|1|6T]]|E|$]]|$1|2H|3|-4|5|6|7|6U|8|@]|D|@]|E|$]]|$1|2I|3|2J|5|6|7|6V|8|@$9|6W|A|6X|B|H]]|D|@]|E|$]]|$1|2K|3|-4|5|6|7|6Y|8|@]|D|@]|E|$]]|$1|2L|3|-4|5|6|7|6Z|8|@]|D|@]|E|$]]|$1|2M|3|2N|5|6|7|70|8|@]|D|@]|E|$]]|$1|2O|3|2P|5|6|7|71|8|@]|D|@]|E|$]]|$1|2Q|3|2R|5|6|7|72|8|@]|D|@]|E|$]]|$1|2S|3|2T|5|1G|7|73|8|@]|D|@]|E|$1H|1I]]|$1|2U|3|-4|5|6|7|74|8|@]|D|@]|E|$]]|$1|2V|3|2W|5|6|7|75|8|@]|D|@]|E|$]]|$1|2X|3|2Y|5|6|7|76|8|@$9|77|A|78|B|H]|$9|79|A|7A|B|H]]|D|@]|E|$]]|$1|2Z|3|W|5|6|7|7B|8|@]|D|@]|E|$]]|$1|30|3|Y|5|Z|7|7C|8|@]|D|@$9|7D|A|7E|1|7F]]|E|$]]|$1|31|3|W|5|6|7|7G|8|@]|D|@]|E|$]]|$1|32|3|-4|5|6|7|7H|8|@]|D|@]|E|$]]]|33|$34|$5|35|36|37|E|$38|39|3A|-4]]|3B|$5|35|36|37|E|$38|3C|3A|-4]]|3D|$5|35|36|37|E|$38|3E|3A|-4]]|3F|$5|3G|36|3H|E|$3I|3J]]|3K|$5|3G|36|3H|E|$3I|3L]]|3M|$5|35|36|37|E|$38|3N|3A|-4]]|3O|$5|3G|36|3H|E|$3I|3P]]|3Q|$5|35|36|37|E|$38|3R|3A|-4]]]]

You have to change your HEAD, Not yours of course but git HEAD....

So before answering let's add some background, explaining what is this <code>HEAD</code>.

<h1><code>First of all what is HEAD?</code></h1>

<code>HEAD</code> is simply a reference to the current commit (latest) on the current branch. 
There can only be a single <code>HEAD</code> at any given time. (excluding <code>git worktree</code>)

The content of <code>HEAD</code> is stored inside <code>.git/HEAD</code> and it contains the 40 bytes SHA-1 of the current commit.

<hr>

<h1><code>detached HEAD</code></h1>

If you are not on the latest commit - meaning that <code>HEAD</code> is pointing to a prior commit in history its called <code>detached HEAD</code>.

<a href="https://i.stack.imgur.com/OlavO.png" rel="noreferrer"><img src="https://i.stack.imgur.com/OlavO.png" alt="enter image description here"></a>

On the command line, it will look like this- SHA-1 instead of the branch name since the <code>HEAD</code> is not pointing to the tip of the current branch

<a href="https://i.stack.imgur.com/qplvo.png" rel="noreferrer"><img src="https://i.stack.imgur.com/qplvo.png" alt="enter image description here"></a>

<h2><a href="https://i.stack.imgur.com/U0l3s.png" rel="noreferrer"><img src="https://i.stack.imgur.com/U0l3s.png" alt="enter image description here"></a></h2>

<h3>A few options on how to recover from a detached HEAD:</h3>

<hr>

<h3><a href="https://git-scm.com/docs/git-checkout" rel="noreferrer"><code>git checkout</code></a></h3>

<pre><code>git checkout &lt;commit_id&gt;
git checkout -b &lt;new branch&gt; &lt;commit_id&gt;
git checkout HEAD~X // x is the number of commits t go back
</code></pre>

This will checkout new branch pointing to the desired commit. 
This command will checkout to a given commit. 
At this point, you can create a branch and start to work from this point on.

<pre><code># 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 &lt;commit-id&gt;

# create a new branch forked to the given commit
git checkout -b &lt;branch name&gt;
</code></pre>

<hr>

<h3><a href="https://git-scm.com/docs/git-reflog" rel="noreferrer"><code>git reflog</code></a></h3>

You can always use the <code>reflog</code> as well. 
<code>git reflog</code> will display any change which updated the <code>HEAD</code> and checking out the desired reflog entry will set the <code>HEAD</code> back to this commit. 

Every time the HEAD is modified there will be a new entry in the <code>reflog</code>

<pre><code>git reflog
git checkout HEAD@{...}
</code></pre>

This will get you back to your desired commit

<a href="https://i.stack.imgur.com/atW9w.png" rel="noreferrer"><img src="https://i.stack.imgur.com/atW9w.png" alt="enter image description here"></a>

<hr>

<h3><a href="https://git-scm.com/docs/git-reset" rel="noreferrer"><code>git reset --hard &lt;commit_id&gt;</code></a></h3>

"Move" your HEAD back to the desired commit.

<pre class="lang-sh prettyprint-override"><code># 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.
</code></pre>

<ul>
<li>Note: (<a href="https://github.com/git/git/blob/master/Documentation/RelNotes/2.7.0.txt" rel="noreferrer">Since Git 2.7</a>) 
you can also use the <code>git rebase --no-autostash</code> as well.</li>
</ul>

<hr>

<h3><a href="https://git-scm.com/docs/git-revert" rel="noreferrer"><code>git revert &lt;sha-1&gt;</code></a></h3>

"Undo" the given commit or commit range. 
The reset command will "undo" any changes made in the given commit. 
A new commit with the undo patch will be committed while the original commit will remain in the history as well.

<pre class="lang-sh prettyprint-override"><code># add new commit with the undo of the original one.
# the &lt;sha-1&gt; can be any commit(s) or commit range
git revert &lt;sha-1&gt;
</code></pre>

<hr>

This schema illustrates which command does what. 
As you can see there <code>reset &amp;&amp; checkout</code> modify the <code>HEAD</code>.

<a href="https://i.stack.imgur.com/NuThL.png" rel="noreferrer"><img src="https://i.stack.imgur.com/NuThL.png" alt="enter image description here"></a>

blocks|key|2731813|text|只需创建新的分支，然后精挑细选所需的提交。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2731814|它比上面许多答案中描述的重置更节省和更简单|2731815|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

Just create new branch, then cherry-pick desired commits to it.

Its saver and simpler then resets described in many answers above

blocks|key|2731990|text|回答问题“Git+a+merge+been+pushed+pushed”|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|2731991|2731992|你可以使用git+reset+--hard+HEAD~1|blockquote|CODE|2731993|2731994|2731995|考虑以下情况，其中有2个分支master和feature-1\f25-1|2731996|2731997|$+git+log+--graph+--oneline+--all|code-block|syntax|javascript|2731998|​|2731999|📷|atomic|2732000|2732001|2732002|+Do+Git+merge|2732003|2732004|2732005|$+git+merge+feature-1|2732006|2732007|$+git+log+--graph+--oneline+--all|2732008|2732009|2732010|2732011|2732012|+撤消Git合并|2732013|2732014|2732015|$+git+reset+--hard+HEAD~1|2732016|2732017|$+git+log+--graph+--oneline+--all|2732018|2732019|2732020|2732021|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://i.imgur.com/Yw9XS1y.png|imageAlt|1|https://i.imgur.com/buVF9GJ.png|2|https://i.imgur.com/UDIUJ3c.png^0|A|P|0|0|5|N|0|0|0|E|6|L|D|0|0|0|0|0|1|0|0|0|0|1|C|0|0|0|0|0|0|0|0|1|1|0|0|0|1|7|0|0|0|0|0|0|0|0|1|2|0|0^^$0|@$1|2|3|4|5|6|7|23|8|@$9|24|A|25|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|26|8|@]|D|@]|E|$]]|$1|G|3|H|5|I|7|27|8|@$9|28|A|29|B|J]]|D|@]|E|$]]|$1|K|3|-4|5|6|7|2A|8|@]|D|@]|E|$]]|$1|L|3|-4|5|6|7|2B|8|@]|D|@]|E|$]]|$1|M|3|N|5|6|7|2C|8|@$9|2D|A|2E|B|C]|$9|2F|A|2G|B|C]]|D|@]|E|$]]|$1|O|3|-4|5|6|7|2H|8|@]|D|@]|E|$]]|$1|P|3|Q|5|R|7|2I|8|@]|D|@]|E|$S|T]]|$1|U|3|V|5|6|7|2J|8|@]|D|@]|E|$]]|$1|W|3|X|5|Y|7|2K|8|@]|D|@$9|2L|A|2M|1|2N]]|E|$]]|$1|Z|3|V|5|6|7|2O|8|@]|D|@]|E|$]]|$1|10|3|-4|5|6|7|2P|8|@]|D|@]|E|$]]|$1|11|3|12|5|I|7|2Q|8|@$9|2R|A|2S|B|C]]|D|@]|E|$]]|$1|13|3|-4|5|6|7|2T|8|@]|D|@]|E|$]]|$1|14|3|-4|5|6|7|2U|8|@]|D|@]|E|$]]|$1|15|3|16|5|R|7|2V|8|@]|D|@]|E|$S|T]]|$1|17|3|-4|5|6|7|2W|8|@]|D|@]|E|$]]|$1|18|3|19|5|R|7|2X|8|@]|D|@]|E|$S|T]]|$1|1A|3|V|5|6|7|2Y|8|@]|D|@]|E|$]]|$1|1B|3|X|5|Y|7|2Z|8|@]|D|@$9|30|A|31|1|32]]|E|$]]|$1|1C|3|V|5|6|7|33|8|@]|D|@]|E|$]]|$1|1D|3|-4|5|6|7|34|8|@]|D|@]|E|$]]|$1|1E|3|1F|5|I|7|35|8|@$9|36|A|37|B|C]]|D|@]|E|$]]|$1|1G|3|-4|5|6|7|38|8|@]|D|@]|E|$]]|$1|1H|3|-4|5|6|7|39|8|@]|D|@]|E|$]]|$1|1I|3|1J|5|R|7|3A|8|@]|D|@]|E|$S|T]]|$1|1K|3|-4|5|6|7|3B|8|@]|D|@]|E|$]]|$1|1L|3|1M|5|R|7|3C|8|@]|D|@]|E|$S|T]]|$1|1N|3|V|5|6|7|3D|8|@]|D|@]|E|$]]|$1|1O|3|X|5|Y|7|3E|8|@]|D|@$9|3F|A|3G|1|3H]]|E|$]]|$1|1P|3|V|5|6|7|3I|8|@]|D|@]|E|$]]|$1|1Q|3|-4|5|6|7|3J|8|@]|D|@]|E|$]]]|1R|$1S|$5|1T|1U|1V|E|$1W|1X|1Y|-4]]|1Z|$5|1T|1U|1V|E|$1W|20|1Y|-4]]|21|$5|1T|1U|1V|E|$1W|22|1Y|-4]]]]

Answering the question &quot;Undo a Git merge that hasn't been pushed yet&quot;
<blockquote>
You can use <code>git reset --hard HEAD~1</code>
</blockquote>
Consider the following situation where there are 2 branches master and feature-1:
<hr />
<pre><code>$ git log --graph --oneline --all
</code></pre>
<img src="https://i.imgur.com/Yw9XS1y.png" alt="" />
<blockquote>
Do Git merge
</blockquote>
<pre><code>$ git merge feature-1
</code></pre>
<hr />
<pre><code>$ git log --graph --oneline --all
</code></pre>
<img src="https://i.imgur.com/buVF9GJ.png" alt="" />
<blockquote>
Undo Git merge
</blockquote>
<pre><code>$ git reset --hard HEAD~1
</code></pre>
<hr />
<pre><code>$ git log --graph --oneline --all
</code></pre>
<img src="https://i.imgur.com/UDIUJ3c.png" alt="" />

blocks|key|1323504|text|如果分支被合并并且没有被推送，那么下面给出的git+reset命令将会撤销合并：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1323505|git+reset+--merge+ORIG_HEAD|code-block|syntax|javascript|1323506|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

If branches are merged and not pushed, then git reset command given below will work to undo the merge:
<pre><code>git reset --merge ORIG_HEAD
</code></pre>

Within my master branch, I did a <code>git merge some-other-branch</code> locally, but never pushed the changes to origin master. I didn't mean to merge, so I'd like to undo it. When doing a <code>git status</code> after my merge, I was getting this message:

<pre><code># On branch master
# Your branch is ahead of 'origin/master' by 4 commits.
</code></pre>

Based upon some <a href="http://www.gitready.com/intermediate/2009/03/16/rolling-back-changes-with-revert.html" rel="noreferrer">instructions I found</a>, I tried running

<pre><code>git revert HEAD -m 1
</code></pre>

but now I'm getting this message with <code>git status</code>:

<pre><code># On branch master
# Your branch is ahead of 'origin/master' by 5 commits.
</code></pre>

I don't want my branch to be ahead by any number of commits. How do I get back to that point?

Undo a Git merge that hasn't been pushed yet

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

在我的master分支中，我在本地执行了git merge some-other-branch，但从未将更改推送到原始master。我不是故意要合并的，所以我想撤销它。在合并后执行git status时，我收到以下消息：# On branch master# Your branch is ahead of 'origi...

问撤消尚未推送的Git合并
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问撤消尚未推送的Git合并EN