結果 : does git merge keep commit history