Add discussion of rebase & merge to git remote.
Merge pull request #133 from gonuke/add_rebase_merge_discussion

Add discussion of rebase & merge to git remote.