How to search a git repository history to find a merge error?

Question

At some point in our past branches of development in git were merged. However, the wrong merge decision was made and therefore some code didn\'t make it into master branch tha

Answer 1

Git log has powerful searching options. Since there's the indication you might know a chunk of code that disappeared, you can search for that string of code

git log .. -S"line I care about" --diff-filter=M

Will search from HERE to THERE for the string after -S and only where the line was modified (added or removed)

You can achieve even more precision in your search if you use -G instead of -S. -G provides regular expression searching instead of string literal searching with -S.