Slide 14
Slide 14 text
remote Git repository (origin)
master
local Git repository (your clone)
master origin/master
local Git repository (your clone)
master
feature
origin/master
remote Git repository (origin)
master
local Git repository (your clone)
master
feature
origin/master
local Git repository (your clone)
master
origin/master
feature
local Git repository (your clone)
master
feature
origin/master
local Git repository (your clone)
master
feature
origin/master
local Git repository (your clone)
master
feature
origin/master
:master> git checkout feature
:feature> git rebase master
option 2) rebase our “feature” branch on top of “master”.
this “rewinds” our branch back to where it started, then “fast-forwards” along “master”, and
finally re-applies each of our change sets. afterward, our local commits have a new SHA1
hash, meaning they are different objects than before rebase, however, the original committer
info & meta-data are preserved.