您即将离开知乎,请注意您的账号和财产安全。
https://stackoverflow.com/questions/28407020/keep-commits-history-after-a-git-merge