如何在 git 中更改哪个提交主指向？

Question

In git, I've been making commits onto the master branch, when really I should have been working on a feature branch. I want to change this so that master is back to where it started, and what was on master is now on a new branch. Basically, my commit history looks like this:

A -- B -- C -- D -- E
          |         |
          |       master
     origin/master

And I want it to look like this:

        master
          |
A -- B -- C -- D -- E
          |         |
          |       new_branch
     origin/master

How can I change where master points?

Answer 1

• stash your uncommitted: git stash
• create a new branch: git branch new_branch
• reset master to origin/master: git reset --hard origin/master
• checkout the new branch again: git checkout new_branch
• unstash your changes: git stash pop

stash/unstash is not necessary if your working tree is clean. just make sure there are no changes in your working tree, because those will be removed when you reset --hard

---

another possibility (faster, and without the need to stash and reset):

• checkout a new branch: git checkout -b new_branch master
• create a 'new' master branch and point it to origin/master's commit: git branch -f master origin/master

Answer 2

$ git checkout master
$ git reset --hard <commit-id-for-master-to-sit-at>

for example try this

$ mkdir example; cd example
$ git init
$ vi testFile.txt
(now add "test commit 1" to line 1 of file)
$ git add *
$ git commit
(add message "(+) 1st commit" to git commit)
$ vi testFile.txt
(now add "test commit 2" to line 1 of file)
$ git add *
$ git commit
(add message "(+) 2nd commit" to git commit)
$ vi testFile.txt
(now add "test commit 3" to line 1 of file)
$ git add *
$ git commit
(add message "(+) 3rd commit" to git commit)
$ git tag final_head
$ git reset --hard HEAD~1

this example shows moving the master to a different commit. Note here that the tag allows us to save the old master, in case :)

Answer 3

Like outlined here , but even simpler, no resets involved, just create a new branch where master was, then painlessly delete master, checkout again the place which you want to move master to and create a new master branch there:

git stash
git checkout -b old_master_was_here
git branch -d master
git checkout origin/master
git checkout -b master

Answer 4

Go to .git/refs/heads/master which has the hash of master and change that to whatever you want. I use gitg to quickly find the hash of master and afterwards to verify that the move was successful.

Answer 5

在当前 HEAD 创建一个新分支new_branch （假设 HEAD = master），将 master 重置为 C 并再次切换到new_branch （就 SmartGit 而言）。

Answer 6

Note that at any given time you can change where a branch points to by using git update-ref refs/heads/branch id , but before you do this, you must give a name to the tip of the tree, otherwise your work will unaccessible. So these two commands may do the job

 git update-ref refs/heads/newfeature HEAD
 git update-ref refs/heads/master XXYYY

But make sure that you do not have any uncommited changes otherwise all hell will break loose