Rebase

O = local commits
* = commits in the repository

Working copy:


* --- * -- * --- * --- O --- O --- O
A     B    C     D     X     Y     Z

Mage repository remote (upstream)

* --- * -- * --- * --- * --- * --- *
A     B    C     D     E     F     G


If you did a "git pull upstream master" (or git fetch && git merge) you'd get something like this:

                 E      F      G
                 * ---- * ---- * ------O (merge)
                 |                    /
* --- * -- * --- * --- O --- O --- O /
A     B    C     D     X     Y     Z

If you did a "git pull --rebase upstream master"

* --- * -- * --- * --- * --- * --- * --- O --- O --- O
A     B    C     D     E     F     G     X     Y     Z