Moving master head to a branch

git version-control branch dvcs branching-and-merging
kostja picture kostja · May 25, 2012 · Viewed 20.6k times · Source

I have several feature branches and a master branch. Feature2 is done. Normally I would rebase (working with a remote SVN repo and would like to keep the history, so no regular merge) and ff-merge. But since master hasnt changed since I branched, I would like to move the master head (at E) to G. Using git branch -f master G does not result in any visible changes, I assumed this is because G is on a different branch.

Is it safe to use git update-ref -f master G here instead? Should I stick with rebase/ff-merge? Something even better? 

feature1      C-D  
             /
master    A-B-E            
               \                      
feature2        F-G

Thank you.

Answer

ralphtheninja picture ralphtheninja · May 25, 2012

You don't have to merge the branches, a reset is enough. Assuming master is checked out:

git reset --hard feature2

Related questions

Reasons for not working on the master branch in Git

So, I'm fairly new to git and I've after a bit of reading around over the last couple of weeks I've read a few people saying that the master branch shouldn't be changed but rather branched from and then merged …

Read More
How can I delete all Git branches which have been merged?

I have many Git branches. How do I delete branches which have already been merged? Is there an easy way to delete them all instead of deleting them one by one?

Read More
How can I get a list of Git branches, ordered by most recent commit?

I want to get a list of all the branches in a Git repository with the "freshest" branches at the top, where the "freshest" branch is the one that's been committed to most recently (and is, therefore, more likely to …

Read More