Git: Show all of the various changes to a single line in a specified file over the entire git history

Solution 1:

Since git 1.8.4, there is a more direct way to answer your question.

Assuming that line 110 is the line saying var identifier = "SOME_IDENTIFIER";, then do this:

git log -L110,110:/lib/client.js

This will return every commit which touched that line of code.

[Git Documentation (see the "-L" command line paramenter)]

Solution 2:

See the man page for git-log and gitdiffcore. I believe this command would do it, but it might not be quite right:

git log -G "var identifier =" file.js

EDIT: Here's a rough start for a bash script to show the actual lines. This might be more what you're looking for.

for c in $(git log -G "something" --format=%H -- file.js); do
    git --no-pager grep -e "something" $c -- file.js
done

It uses git log -G to find the interesting commits, using --format=%H to produce a list of commit hashes. It then iterates over each interesting commit, asking git grep to show the lines from that commit and file that contain the regex, prefaced with the commit hash.


EDIT: Changed to use -G instead of -S as suggested in comments.