Here's the actual answer which people here seem not to want to give. Please use at your own risk.
Assuming we want to update the common ancestor between master branch and feature branch, proceed as follows:
- Go to
masterandgit pull --rebaseto make sure you have the latest master. - Create a branch off
masterwithgit branch -b temp_master - Checkout
featurebranch and from here, rungit merge -s ours temp_master - You can now delete
temp_masterand pushfeaturewithgit push -f origin feature
Your git pull request is now going to display correct diffs.
You would never be able to submit such a pull request to an upstream repo. Because your commit is now essentially removing all changes from the upstream master. At some point, before you submit the pull request, you would need to properly resolve the conflicts.
@Alderath like I said, the purpose of this is to just show the diffs on github as doing
git diff master..feature, which github doesn't do by default.The reason people might "not want to give" this answer is likely because it only thinks of the current repo. Who'd want to contribute to a repo if the owner is only going to completely wipe out any changes except their own?