In Git, my merge is still ongoing (no commit yet). 98% of the changes that show up in git diff are related to what MERGE_HEAD (and parent history singe merge-base) brought. 1% is my work from HEAD and the rest is some manual tweaks and fixes I had to make as part of the merge itself. How to find those? It’s kind of like looking for a needle in a haystack. All variants on git diff yield changes coming from MERGE_HEAD:

In Git, my merge is still ongoing (no commit yet). 98% of the changes that show up in git diff are related to what MERGE_HEAD (and parent history singe merge-base) brought. 1% is my work from HEAD and the rest is some manual tweaks and fixes I had to make as part of the merge itself. How to find those? It’s kind of like looking for a needle in a haystack. All variants on git diff yield changes coming from MERGE_HEAD:

During a merge with git 2.42.0.windows.2 and the Bash console, I had to manually perform some modifications to get it to compile, which I then committed along with the modifications due to the merge itself. Those modifications therefore can be traced to neither parent of the merge commit, but rather are new from the merge commit onwards. I want to talk about those changes with someone else. Can I get git to list them, and only them, under a diff format? If yes, how?

During a merge with git 2.42.0.windows.2 and the Bash console, I had to manually perform some modifications to get it to compile, which I then committed along with the modifications due to the merge itself. Those modifications therefore can be traced to neither parent of the merge commit, but rather are new from the merge commit onwards. I want to talk about those changes with someone else. Can I get git to list them, and only them, under a diff format? If yes, how?