List all modified files in git merge commit - even the fast forwarded

git merge git-branch git-merge
soupdiver picture soupdiver · Feb 5, 2013 · Viewed 42.4k times · Source

I'm thinking if there is a way that when I merge a branch into another branch that ALL changed files are listed in my commit message and not just the ones which were modified in both branches. This would give me a better overview of what was changed in the branch just by seeing the merge commit. Is there a way to do this?

Answer

Schleis picture Schleis · Feb 5, 2013

I don't know how to do that in the commit message. But after the merge, this will give the names of all the files affected by the merge commit:

git log -m --name-only

For only a list of filenames of the commit:

git log -m -1 --name-only --pretty="format:" <Merge SHA>

There is some white space due to the merge having two parents but that can be easily removed.

Related questions

How to replace master branch in Git, entirely, from another branch?

I have two branches in my Git repository: master seotweaks (created originally from master) I created seotweaks with the intention of quickly merging it back into master. However, that was three months ago and the code in this branch is 13 …

Read More
How do I merge changes to a single file, rather than merging commits?

I have two branches (A and B) and I want to merge a single file from branch A with a corresponding single file from Branch B.

Read More
Merge two remote branches in a Git repository

I have one remote repository with many branches. For example, my repository name is: http://navis.com/MyRepo.git Its branches are: development production (master) testing I would like to merge the development branch into the production (master) branch. Can …

Read More