这里有一个很好的变通办法。在GitHub中查看PR时，使用Edit按钮将基本分支更改为master以外的内容。然后切换回master，现在它将正确地显示最近提交的更改。

您需要在~/中添加以下内容。gitconfig文件:

[rebase]
    autosquash = true

这将自动实现与此答案所显示的相同的结果。

接下来我来处理。

这里有一个很好的变通办法。在GitHub中查看PR时，使用Edit按钮将基本分支更改为master以外的内容。然后切换回master，现在它将正确地显示最近提交的更改。

一旦我在开始新的改变或创建PR之前开始做以下事情，这个问题就不会发生在我身上。

git pull --rebase origin <target-branch>

这基本上确保了从本地添加的任何新更改都堆叠在当前远程分支中的内容之上。因此，我们的本地分支总是在当前远程头的顶部，只有新的提交在PR中。

这发生在GitHub中，当你压缩从目标分支合并的提交时。

I had been using squash and merge with Github as the default merge strategy, including merges from the target branch. This introduces a new commit and GitHub doesn't recognize that this squashed commit is the same as the ones already in master (but with different hashes). Git handles it properly but you see all the changes again in GitHub, making it annoying to review. The solution is to do a regular merge of these pulled in upstream commits instead of a squash and merge. When you want to merge in another branch into yours as a dependency, git merge --squash and revert that single commit before pulling from master once that other branch has actually made it to master.

编辑:另一种解决方案是重新基底和强制推。干净但被改写的历史

使用git的精选

如果重基过程对您来说像对我一样混乱，另一个选择是使用git精选。以下是步骤:

Update your local target branch using git pull. checkout the branch where you made changes and copy the commit IDs of the commits you want. if the branch name is tangled, do git checkout tangled and then git log. You can scroll through the git log output using the up/down arrows on the keyboard. The commit IDs are the long numbers that each commit contains. Create a new branch from your target branch (e.g main) using git checkout -b new-branch-name when you are on the target branch. On the new branch, do git cherry-pick commit-id where commit-id is the long number that you copied from git log which identifies the commit you want to push. You can do this multiple times, changing the id each time to get another commit. If you run git log on this new branch which you created, you can see that only the changes you have added exist after your target branch's head, as expected. Lastly, push the changes to remote using git push origin new-branch-name and create a pull request.