What does git rebase do?

What does git rebase do?

• A. Picks up the commit you made on your branch and reapplies them after the last commit on the selected branch
• B. Creates a new merge commit always
• C. Deletes commits from the history
• D. Only merges in a non-linear way without changing history

Answer: (A)

Rebase takes the commits you’ve made on your branch and replays them on top of another branch’s tip, effectively moving your branch’s base to the latest commit of that branch. This produces a linear history, because your changes appear as if you started from the other branch’s end and then added your work on top of it. Each of your commits becomes a new commit with its own new identifier, so you’re rewriting history rather than creating a merge. If conflicts arise, you resolve them during the rebase process. Rebase is great for keeping a clean, straight history, but remember it rewrites public history, so use it with caution on branches others are tracking; in many cases, merging is preferable when collaborating.

Rebase takes the commits you’ve made on your branch and replays them on top of another branch’s tip, effectively moving your branch’s base to the latest commit of that branch. This produces a linear history, because your changes appear as if you started from the other branch’s end and then added your work on top of it. Each of your commits becomes a new commit with its own new identifier, so you’re rewriting history rather than creating a merge. If conflicts arise, you resolve them during the rebase process. Rebase is great for keeping a clean, straight history, but remember it rewrites public history, so use it with caution on branches others are tracking; in many cases, merging is preferable when collaborating.