Get all files that have been modified in git branch

GitBranch

Git Problem Overview


Is there a way to see what files have changed in a branch?

Git Solutions


Solution 1 - Git

An alternative to the answer by @Marco Ponti, and avoiding the checkout:

git diff --name-only <notMainDev> $(git merge-base <notMainDev> <mainDev>)

If your particular shell doesn't understand the $() construct, use back-ticks instead.

Solution 2 - Git

All you have to do is the following:

git checkout <notMainDev>
git diff --name-only <mainDev>

This will show you only the filenames that are different between the two branches.

Solution 3 - Git

amazed this has not been said so far!

git diff main...branch

So see the changes only on branch

To check the current branch use

git diff main...

Thanks to jqr

This is short hand for

git diff $(git merge-base main branch) branch

so the merge base (the most recent common commit between the branches) and the branch tip

Also using origin/main instead of just master will help in case your local main is dated

Solution 4 - Git

I can't believe there are so many ways to do this. I use whatchanged as someone posted before, just with the following arguments:

git whatchanged --name-only --pretty="" origin..HEAD

This just lists the filenames, and only the ones that changed on the current branch.

Solution 5 - Git

I really liked @twalberg's answer but I didn't want to have to type the current branch name all the time. So I'm using this:

git diff --name-only $(git merge-base master HEAD)

Solution 6 - Git

Update Nov 2020:

To get the list of files modified (and committed!) in the current branch you can use the shortest console command using standard [tag:git]:

git diff --name-only master...


  • If your local "master" branch is outdated (behind the remote), add a remote name (assuming it is "origin"):

    git diff --name-only origin/master...

  • If you want to include uncommitted changes as well, remove the ...:

    git diff --name-only master

  • If you use different main branch name (eg: "main"), substitute it:

    git diff --name-only main...

  • If your want to output to stdout (so its copyable):

    git diff --name-only master... | cat

  • If your want filenames to be clickable in VSCode terminal no matter what folder you are running this command from, add --relative:

    git diff --name-only --relative master... | cat


per really nice detailed explanation of different options https://blog.jpalardy.com/posts/git-how-to-find-modified-files-on-a-branch/

Solution 7 - Git

git diff --name-only master...branch-name

to which we want to compare.

Solution 8 - Git

git whatchanged seems to be a good alternative.

Solution 9 - Git

What if it could be as easy as this?

git changed

If you're willing to assume that the main branch is called "master", and that you create your other branches from master, then you can add this alias to your ~/.gitconfig file to make it that easy:

cbranch = !"git branch | grep '*' | cut -f2 -d' '"
changed = !"git diff --name-only $(git cbranch) $(git merge-base $(git cbranch) master)"

Those assumptions will work for most people in most situations, but you must be aware that you're making them.

Also, you must use a shell that supports $(). It's very likely that your shell supports this.

Solution 10 - Git

git show --stat origin/branch_name

This will give you a list of the files that have been added or modified under this branch.

Solution 11 - Git

For some reason no one mentioned git-tree. See https://stackoverflow.com/a/424142/1657819

git-tree is preferred because it's a plumbing command; meant to be programmatic (and, presumably, faster)

(assuming base branch is master)

git diff-tree --no-commit-id --name-only -r master..branch-name

However this will show you all files which were affected in the branch, if you want to see explicitly modified files only, you can use --diff-filter:

git diff-tree --no-commit-id --name-only -r master..branch-name --diff-filter=M

Also one can use --name-status instead of --name-only to see the status of the files (A/M/D and so on)

Solution 12 - Git

Considering you're on a feature branch and you want to check which files have changed compared to master... just this:

git diff --name-only master

Solution 13 - Git

The accepted answer - git diff --name-only <notMainDev> $(git merge-base <notMainDev> <mainDev>) - is very close, but I noticed that it got the status wrong for deletions. I added a file in a branch, and yet this command (using --name-status) gave the file I deleted "A" status and the file I added "D" status.

I had to use this command instead:

git diff --name-only $(git merge-base <notMainDev> <mainDev>)

Solution 14 - Git

I use grep so I only get the lines with diff --git which are the files path:

git diff branchA branchB | grep 'diff --git'
// OUTPUTS ALL FILES WITH CHANGES, SIMPLE HA :)
diff --git a/package-lock.json b/package-lock.json

Solution 15 - Git

Expanding off of what @twalberg and @iconoclast had, if you're using cmd for whatever reason, you can use:

FOR /F "usebackq" %x IN (`"git branch | grep '*' | cut -f2 -d' '"`) DO FOR /F "usebackq" %y IN (`"git merge-base %x master"`) DO git diff --name-only %x %y

Solution 16 - Git

The following batch file is based on twalberg's answer but will work in Windows:

@ECHO OFF
C:                               :: <== OR USE A DIFFERENT DRIVE
CD \path\to\where\git\files\are  :: <== CHANGE TO THE ACTUAL PATH
SET /p b="Enter full path of an ALREADY MERGED branch to compare with origin/master: "
bash --login -i -c "git diff --name-only %b% $(git merge-base %b1% origin/drop2/master)"
PAUSE

The above assumes that the main branch is origin/master and that git bash was included when Git was installed (and its location is in the path environment). I actually needed to show the actual differences using a configured diff tool (kdiff3) so substituted the following bash command above:

bash --login -i -c "git difftool --dir-diff %b% $(git merge-base %b1% origin/drop2/master)"

Attributions

All content for this solution is sourced from the original question on Stackoverflow.

The content on this page is licensed under the Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) license.

Content TypeOriginal AuthorOriginal Content on Stackoverflow
QuestionRaifView Question on Stackoverflow
Solution 1 - GittwalbergView Answer on Stackoverflow
Solution 2 - GitMarco PontiView Answer on Stackoverflow
Solution 3 - GitexussumView Answer on Stackoverflow
Solution 4 - GitlukillerView Answer on Stackoverflow
Solution 5 - GitYep_It's_MeView Answer on Stackoverflow
Solution 6 - Gitc69View Answer on Stackoverflow
Solution 7 - GitRajesh DusaView Answer on Stackoverflow
Solution 8 - GitchalasrView Answer on Stackoverflow
Solution 9 - GiticonoclastView Answer on Stackoverflow
Solution 10 - GitBadariView Answer on Stackoverflow
Solution 11 - GitThe GodfatherView Answer on Stackoverflow
Solution 12 - GitLeniel MaccaferriView Answer on Stackoverflow
Solution 13 - GitConnor ClarkView Answer on Stackoverflow
Solution 14 - GitT04435View Answer on Stackoverflow
Solution 15 - GitLunyxView Answer on Stackoverflow
Solution 16 - GitSteve ChambersView Answer on Stackoverflow