Actions

EmSys

Git - Rebasing

From EdWiki

GitLab - Rebasing

  • Goals
    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
  • 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 …
    1. If the branch is public and shared with others. Rewriting publicly shared branches will tend to screw up other members of the team.
    2. When the exact history of the commit branch is important (since rebase rewrites the commit history).

Given the above guidelines, we tend to use rebase for short-lived, local branches and merge for branches in the public repository.