o is a commit
x denotes where we are right now

Initial state:

     master
       ^
o------x


git checkout -b oghran

     master
       ^
o------x
       v
    oghran


git add .
git commit -a -m "Message"

     master
       ^
o------o------x
              v
           oghran
           "Message"


git fetch

     master        origin/master
       ^              ^
o------o-----...------o
        \
         \
          x
          v
        oghran


git checkout master

     master        origin/master
       ^              ^
o------x-----...------o
        \
         \
          o
          v
        oghran


git rebase origin/master

                origin/master
                      ^
o------o-----...------x
        \             v
         \          master
          o
          v
        oghran


git checkout oghran

                origin/master
                      ^
o------o-----...------o
        \             v
         \          master
          x
          v
        oghran



git rebase master

                    master
                      ^
o------o-----...------o
                      \
                       \
                        x
                        v
                      oghran