blocks|key|414248|text|如果您的存储库没有被其他人使用，您可以安全地使用git+push+-f来覆盖远程分支。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|414249|entityMap^0|O|B|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

If your repository isn't being used by other people, you can safely do <code>git push -f</code> to overwrite the remote branch.

blocks|key|414279|text|ANeves是对的，"git+push+-f“之所以有效，是因为你是唯一使用该存储库的人。对于大多数人来说，这不是一个可接受的解决方案。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|414280|这是您当前的提交历史记录：|414281|---A-B+<+HEAD+(bad)
++++\
+++++C+<+my_branch+(good)|code-block|syntax|javascript|414282|这里有你想要的解决方案：How+do+I+'overwrite',+rather+than+'merge',+a+branch+on+another+branch+in+Git?|offset|length|414283|简单地说，|414284|git+checkout+my_branch
git+merge+-s+ours+HEAD|414285|这将在HEAD的分支上执行所有更改，并为您提供以下内容：|414286|--A-B-D+<+HEAD,+my_branch+(both+good)
+++\+/
++++C|414287|在这种情况下，D实际上和C是一样的，只是它有不同的父代。|414288|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/4624357/git-how-to-overwrite-rather-than-merge-a-branch-on-another-branch^0|0|0|0|C|25|0|0|0|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|@$K|18|L|19|1|1A]]|A|$]]|$1|M|3|N|5|6|7|1B|8|@]|9|@]|A|$]]|$1|O|3|P|5|F|7|1C|8|@]|9|@]|A|$G|H]]|$1|Q|3|R|5|6|7|1D|8|@]|9|@]|A|$]]|$1|S|3|T|5|F|7|1E|8|@]|9|@]|A|$G|H]]|$1|U|3|V|5|6|7|1F|8|@]|9|@]|A|$]]|$1|W|3|-4|5|6|7|1G|8|@]|9|@]|A|$]]]|X|$Y|$5|Z|10|11|A|$12|13]]]]

ANeves is right, "git push -f" only works because you were the only person using the repository. This is not an acceptable solution for most people.

Here's your current commit history:

<pre><code>---A-B &lt; HEAD (bad)
 \
 C &lt; my_branch (good)
</code></pre>

This has the solutions you want:
<a href="https://stackoverflow.com/questions/4624357/git-how-to-overwrite-rather-than-merge-a-branch-on-another-branch">How do I &#39;overwrite&#39;, rather than &#39;merge&#39;, a branch on another branch in Git?</a>

To recap,

<pre><code>git checkout my_branch
git merge -s ours HEAD
</code></pre>

This will stomp all the changes on HEAD's branch, and give you the following:

<pre><code>--A-B-D &lt; HEAD, my_branch (both good)
 \ /
 C
</code></pre>

D is effectively the same as C in this case, it just has different parents.

blocks|key|196167|text|以下是您可以执行的操作：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|196168|git+checkout+<branch-to-modify-head>
git+reset+--hard+<commit-hash-id-to-put-as-head>
git+push+-f|code-block|syntax|javascript|196169|如果你不强制推送，git将抛出这个错误:更新被拒绝，因为你当前分支的尖端是落后的。|196170|请注意，这将篡改您的git历史记录，因此另一种方法是还原您不想要的每个提交。这样你就可以保留你的历史记录：|196171|git+revert+commit-id|196172|干杯|196173|entityMap^0|0|0|0|0|0|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|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|T|8|@]|9|@]|A|$]]|$1|K|3|L|5|D|7|U|8|@]|9|@]|A|$E|F]]|$1|M|3|N|5|6|7|V|8|@]|9|@]|A|$]]|$1|O|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|P|$]]

Here is what you can do:

<pre><code>git checkout &lt;branch-to-modify-head&gt;
git reset --hard &lt;commit-hash-id-to-put-as-head&gt;
git push -f
</code></pre>

If you don't force the push, git will throw this error: Updates were rejected because the tip of your current branch is behind. 

Note that this will tamper your git history, so another way of doing this is revert each commit you don't want. That way you retain your history:

<pre><code>git revert commit-id
</code></pre>

Cheers

blocks|key|196209|text|我这样做的方式是：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|196210|git+reset+--hard+<commit-SHA>
git+push+origin+HEAD:<name-of-remote-branch>|code-block|syntax|javascript|196211|这是git推荐的方式，而且对于开发团队中的其他每个人来说，执行git+push+-f可能有点问题|offset|length|style|CODE|196212|entityMap^0|0|0|V|B|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]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

The way I do it is: 

<pre><code>git reset --hard &lt;commit-SHA&gt;
git push origin HEAD:&lt;name-of-remote-branch&gt;
</code></pre>

It's the way git recommends and doing <code>git push -f</code> might be a little problematic for everyone else in the development team

blocks|key|414380|text|我来派对有点晚了--我不得不这么做：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|414381|git+push+-f+origin+HEAD:<name-of-branch>|code-block|syntax|javascript|414382|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|$]]

I'm a bit late to the party - I had to do:

<pre><code>git push -f origin HEAD:&lt;name-of-branch&gt;
</code></pre>

blocks|key|196267|text|唯一对我起作用的是：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|196268|git+checkout+<OLD_COMMIT>
git+branch+temp
git+checkout+temp
git+branch+-f+master+temp
git+checkout+master
git+branch+-d+temp|code-block|syntax|javascript|196269|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|$]]

The only thing that worked for me:

<pre><code>git checkout &lt;OLD_COMMIT&gt;
git branch temp
git checkout temp
git branch -f master temp
git checkout master
git branch -d temp
</code></pre>

blocks|key|414432|text|对于我们这些在受保护分支上工作的人来说，推送-f不是一种选择。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|414433|而是：|414434|Checkout+HEAD
diff+{hash+of+desired+commit+to+use+as+new+HEAD}+>+myChange.patch
git+apply+
commit+
push|code-block|syntax|javascript|414435|如果您有想要合并到新版本的HEAD中的更改，如OP，我将首先备份它们，更正远程存储库，然后应用更改。|414436|这还会保留您的回购历史记录。|414437|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|P|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|Q|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|R|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|S|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

For those of us working on protected branches, push -f isn't an option. 

Instead:

<pre><code>Checkout HEAD
diff {hash of desired commit to use as new HEAD} &gt; myChange.patch
git apply 
commit 
push
</code></pre>

If you have changes you'd like to merge into the new version of HEAD like OP, I would back them up first, correct the remote repo, then apply the changes.

This also preserves your repo history.

blocks|key|196360|text|对我来说非常有效的步骤如下--|type|unstyled|depth|inlineStyleRanges|entityRanges|data|196361|1)+git+log+--oneline|196362|2)获取您想要回滚的提交(最有可能是在您的最后一次提交之前的提交，在头部和推送)|196363|3)+git签出(这是您希望将工作回滚到的提交id+)|196364|4)+git+push+-f源站HEAD:master+(-f会强制推流覆盖所有被推送分支在remote后面时的拒绝)+HEAD+:+master+(这是为了确保您将回滚推送到master分支，位于远程repo的头部)|196365|5)就是这样:)|196366|entityMap^0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|O|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|P|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|Q|8|@]|9|@]|A|$]]|$1|H|3|I|5|6|7|R|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|S|8|@]|9|@]|A|$]]|$1|L|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|M|$]]

The steps that worked for me perfectly are following --

1) git log --oneline

2) Grab the commit that you want to rollback (most likely the commit before your last commit at HEAD and push)

3) git checkout (this is the commit id to where you want your work to rollback to)

4) git push -f origin HEAD:master (-f will force the push overriding any rejection that would happen if pushed branch is behind the remote) 
HEAD:master(This is to ensure you are pushing the rollback to the master branch and at HEAD of the remote repo)

5) That's it :)

I'm still trying to learn the (basic?) finer points of Git and have managed to get myself into trouble. I realized that I made some mistakes on HEAD, checked out an older commit and started coding from there. When I attempt a push I'm told that my current commit is behind and I need to merge with HEAD. Git recommends "git pull". However, HEAD has the code I want to ignore. How do I solve this problem? Thanks so much for the help.

Flowchart:

<pre><code>-------- HEAD (bad) ---------------------- + (behind conflict, requires
 \ / merge with HEAD, which is
 \------- Current commit (good) ----/ bad and needs to be ignored)
</code></pre>

How can I make an older commit HEAD in Git?

我还在努力学习(基础？)更好的Git要点，并设法使自己陷入麻烦。我意识到我犯了一些错误，检查了一个较旧的提交，并从那里开始编码。当我尝试推送时，我被告知我当前的提交是落后的，我需要与HEAD合并。Git推荐使用"git pull“。然而，HEAD有我想忽略的代码。我该如何解决这个问题？非常感谢你的帮助。流程图：----...

问如何在Git中创建一个较老的提交头？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在Git中创建一个较老的提交头？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在Git中创建一个较老的提交头？
EN