結果 : git merge keep commit history