lab 34 Rebasing
- Use the rebase command rather than the merge command.
Ok, we are back in time before the first merge and we want to get the changes in master into our greet branch.
This time we will use the rebase command instead of the merge command to bring in the changes from the master branch.
git checkout greet git rebase master git hist
$ go greet Switched to branch 'greet' $ $ git rebase master First, rewinding head to replay your work on top of it... Applying: added Greeter class Applying: hello uses Greeter Applying: updated Rakefile $ $ git hist * e0cc19e 2020-06-20 | Updated Rakefile (HEAD -> greet) [Jim Weirich] * 046088a 2020-06-20 | Hello uses Greeter [Jim Weirich] * 3db0ffe 2020-06-20 | Added greeter class [Jim Weirich] * 8d90176 2020-06-20 | Added README (master) [Jim Weirich] * 5aec14d 2020-06-20 | Added a Rakefile. [Jim Weirich] * 721b979 2020-06-20 | Moved hello.rb to lib [Jim Weirich] * 907a445 2020-06-20 | Add an author/email comment [Jim Weirich] * 4254c94 2020-06-20 | Added a comment (tag: v1) [Jim Weirich] * c8b3af1 2020-06-20 | Added a default value (tag: v1-beta) [Jim Weirich] * 30c2cd4 2020-06-20 | Using ARGV [Jim Weirich] * 4445720 2020-06-20 | First Commit [Jim Weirich]
Merge VS Rebase
The final result of the rebase is very similar to the merge. The greet branch now contains all of its changes, as well as all the changes from the master branch. However, the commit tree is quite different. The commit tree for the greet branch has been rewritten so that the master branch is a part of the commit history. This leaves the chain of commits linear and much easier to read.
When to Rebase, When to Merge?
Don’t use rebase …
- If the branch is public and shared with others. Rewriting publicly shared branches will tend to screw up other members of the team.
- When the exact history of the commit branch is important (since rebase rewrites the commit history).
Given the above guidelines, I tend to use rebase for short-lived, local branches and merge for branches in the public repository.