Caution: I usually do rebase instead of merge, so some commits can be removed or modified during rebasing.