Update git.md

how to merge two commits