rebasing

01 before anything happens

master   o-o-o-o-o-A


A - original master

02 feature started

master   o-o-o-o-o-A
                    \
feature              B

A - original master
B - first feature commit

03 feature worked on

master   o-o-o-o-o-A
                    \
feature              B-o-o-o-o



A - original master
B - first feature commit

04 updates requested

updates              C
                    /
master   o-o-o-o-o-A
                    \
feature              B-o-o-o-o



A - original master
B - first feature commit
C - first update commit

05 merge master with updates

                     updates
master   o-o-o-o-o-A-C
                    \
feature              B-o-o-o-o



A - original master
B - first feature commit
C - first update commit

06 feature is based on old master so rebase

                     updates
master   o-o-o-o-o-A-C
                      \
feature                B-o-o-o-o



A - original master
B - first feature commit
C - first update commit

07 more updates more work on feature

updates                D-o-o
                      /
master   o-o-o-o-o-A-C
                      \
feature                B-o-o-o-o-E-o-o-o



A - original master
B - first feature commit
C - first update commit
D - new update commit
E - new feature commit

08 updates go live

                           updates
master   o-o-o-o-o-A-C-D-o-o
                      \
feature                B-o-o-o-o-E-o-o-o



A - original master
B - first feature commit
C - first update commit
D - new update commit
E - new feature commit

09 feature goes live

1. rebase

                           updates
master   o-o-o-o-o-A-C-D-o-o
                            \
feature                      B-o-o-o-o-E-o-o-o


2. merge feature into master (fast-forward)

                           updates
master   o-o-o-o-o-A-C-D-o-o-B-o-o-o-o-E-o-o-o
                                             feature


A - original master
B - first feature commit
C - first update commit
D - new update commit
E - new feature commit

10 dont do this

1. new update

updates              C
                    /
master   o-o-o-o-o-A
                    \
feature              B-o-o-o-o


2. merge updates into master

                     updates
master   o-o-o-o-o-A-C
                    \
feature              B-o-o-o-o


3. merge feature into master

master   o-o-o-o-o-A-C---------?
                    \         /
feature              B-o-o-o-o


? - the fuck is this commit for?

don't do this

1. new update

updates              C
                    /
master   o-o-o-o-o-A
                    \
feature              B-o-o-o-o


2. merge updates into master

                     updates
master   o-o-o-o-o-A-C
                    \
feature              B-o-o-o-o


3. merge feature into master

master   o-o-o-o-o-A-C---------?
                    \         /
feature              B-o-o-o-o


? - the fuck is this commit for?

more updates, more work on feature

updates                D-o-o
                      /
master   o-o-o-o-o-A-C
                      \
feature                B-o-o-o-o-E-o-o-o



A - original master
B - first feature commit
C - first update commit
D - new update commit
E - new feature commit