関連ワード:  git merge one commit at a time    commit vs merge  
結果 : git merge one commit at a time