Question

I have a piece of code in another than my current branch in my git repo, and I am not sure which commit and which branch. How can I search in all files that I committed until now for a specific string (and afterwards show the surrounding of that line of code)?

Answer 1

Use git grep to locate the commit:

git grep "string" $(git rev-list --all)

The git rev-list --all makes it search the entire history of the project.

That will give an output like this:

<commit>:<path>:<matched line>

Then you can use git branch --contains to find out which branch the commit is on:

git branch --contains <commit>