結果 : git merge until commit