I'm working on a large project that mixes C++ code and HTML template files.

I learnt today that I was supposed to merge the changes I made to the C++ files (and only those) on another branch, but as you might guess: I can't remember all the commits I did.

Is there a way for me to search, through the git history, all the commits that match all these criterions ?

• Are written by me
• Are located between commit A and commit B
• Contain changes to .cpp, .c or .h files (those are located in a particular sub-directory if that helps).

I'm working on a large project that mixes C++ code and HTML template files.

I learnt today that I was supposed to merge the changes I made to the C++ files (and only those) on another branch, but as you might guess: I can't remember all the commits I did.

Is there a way for me to search, through the git history, all the commits that match all these criteria ?

• Are written by me
• Are located between commit A and commit B
• Contain changes to .cpp, .c or .h files (those are located in a particular sub-directory if that helps).