git rebase explained

Side note

commits

What composes them?

Side note

commits

The tree object (hash of the commit's actual content)

Hash of the parent commit

Author name and timestamp of authoring

Commiter name and timestamp of commit

Commit message

A header

Side note

commits

git rebase explained

commits

What are the consequences on the rebase?

git rebase explained

Reapply commits on top of another base tip

man git-rebase

Elementary my dear Watson?

git rebase explained

Notation

git rebase <target>

re-base the current branch on the top of target

What will be moved on top of <target> and what won't?

git rebase explained

Steps

Find all the commits in the current branch not in target

move the HEAD of the branch to target (reset)

Apply all the commits found in step 1 on top of the branch

git rebase explained

How does collaborative work with rebase?

git rebase explained

See more: rebase with merges

Rebase explained

By Ghislain Rodrigues

Rebase explained

  • 119
Loading comments...

More from Ghislain Rodrigues