Update 2014-11-12-on-git-rebase-merge.md