32. Resetting the style branch
Goals
- Resetting the branch style to the point prior to the first merge.
01 Resetting the style branch
Let us go to the style branch to the point before we merged it with the master branch. We can reset the branch to any commit. In fact, reset can change the branch pointer to point to any commit in the tree.
Here, we want to go back in the style branch to a point before merging with the master. We have to find the last commit prior to the merge.
Run:
git checkout style git hist
Result:
$ git checkout style Already on 'style' $ git hist * 645c4e6 2011-03-09 | Merged master fixed conflict. (HEAD, style) [Alexander Shvets] |\ | * 454ec68 2011-03-09 | Life is great! (master) [Alexander Shvets] * | 5813a3f 2011-03-09 | Merge branch 'master' into style [Alexander Shvets] |\ \ | |/ | * 6c0f848 2011-03-09 | Added README [Alexander Shvets] * | 07a2a46 2011-03-09 | Updated index.html [Alexander Shvets] * | 649d26c 2011-03-09 | Hello uses style.css [Alexander Shvets] * | 1f3cbd2 2011-03-09 | Added css stylesheet [Alexander Shvets] |/ * 8029c07 2011-03-09 | Added index.html. [Alexander Shvets] * 567948a 2011-03-09 | Moved hello.html to lib [Alexander Shvets] * 6a78635 2011-03-09 | Add an author/email comment [Alexander Shvets] * fa3c141 2011-03-09 | Added HTML header (v1) [Alexander Shvets] * 8c32287 2011-03-09 | Added standard HTML page tags (v1-beta) [Alexander Shvets] * 43628f7 2011-03-09 | Added h1 tag [Alexander Shvets] * 911e8c9 2011-03-09 | First Commit [Alexander Shvets]
It's a little hard to read, but we can see from the output that the Updated index.html commit was the latest on the style branch prior to merging. Let us reset the style branch to this commit.
Run:
git reset --hard <hash>
Result:
$ git reset --hard 07a2a46 HEAD is now at 07a2a46 Updated index.html
02 Check the branch.
Look for the style branch log. There are no merge commits in our history.
Run:
git hist --all
Result:
$ git hist --all * 454ec68 2011-03-09 | Life is great! (master) [Alexander Shvets] * 6c0f848 2011-03-09 | Added README [Alexander Shvets] | * 07a2a46 2011-03-09 | Updated index.html (HEAD, style) [Alexander Shvets] | * 649d26c 2011-03-09 | Hello uses style.css [Alexander Shvets] | * 1f3cbd2 2011-03-09 | Added css stylesheet [Alexander Shvets] |/ * 8029c07 2011-03-09 | Added index.html. [Alexander Shvets] * 567948a 2011-03-09 | Moved hello.html to lib [Alexander Shvets] * 6a78635 2011-03-09 | Add an author/email comment [Alexander Shvets] * fa3c141 2011-03-09 | Added HTML header (v1) [Alexander Shvets] * 8c32287 2011-03-09 | Added standard HTML page tags (v1-beta) [Alexander Shvets] * 43628f7 2011-03-09 | Added h1 tag [Alexander Shvets] * 911e8c9 2011-03-09 | First Commit [Alexander Shvets]