git log --follow, show all commits including merges

git git-log
lajarre picture lajarre · May 25, 2015 · Viewed 10.6k times · Source

I would like to git log --follow file.ext but showing all commits, including merges.

Tried no-max-parents, but not helping.

Answer

CodeWizard picture CodeWizard · May 25, 2015

The -m will do the trick for you, log -m is for get into the merges.

git log -m --oneline --full-history --follow file.ext

This should follow the file in the Merges [-m].

And i assume you was aiming to use --min-parents=2 instead of no-max-parents. The --min-parents=2 is the same as --merged since it will return the commit with more then one parent.

You can always add some extra flags to display the results in a more friendly way:
git log -m --name-only --oneline --follow file.ext. It will display the results with the SHA-1 of the commits as well with the message

Related questions

View the change history of a file using Git versioning

How can I view the change history of an individual file in Git, complete details with what has changed? I have got as far as: git log -- [filename] which shows me the commit history of the file, but how …

Read More
Viewing unpushed Git commits

How can I view any local commits I've made, that haven't yet been pushed to the remote repository? Occasionally, git status will print out that my branch is X commits ahead of origin/master, but not always. Is this a …

Read More
Pretty git branch graphs

I've seen some books and articles have some really pretty looking graphs of git branches and commits. How can I make high-quality printable images of git history?

Read More