Add discussion of rebase & merge to git remote.

Take a look @gidden