Am trying to establish if a change was erased in a merge by somebody. Suppose the commit is still somewhere in the git commits. Does the following guarantee I will see the change regardless of how it was merged?

git log -p --all some_file

CodePudding user response：

By default git log overlooks the details of merge commits, you have to add one of the --diff-merges option.

In your case -c (short for --diff-merges=combined) is probably a good fit.

Also : add --graph, it really helps in understanding how commits are related.