Add 2014-08-18-what-is-the-difference-between-git-rebase-and-git-merge.markdown