Menu
I want to merge two branches that have been separated for a while and wanted to know which files have been modified.
Came across this link: http://linux.yyz.us/git-howto.html which was quite useful.
The tools to compare branches I've come across are:
git diff master..branchgit log master..branchgit shortlog master..branchWas wondering if there's something like "git status master..branch" to only see those files that are different between the two branches.
Without creating a new tool, I think this is the closest you can get to do that now (which of course will show repeats if a file was modified more than once):
git diff master..branch | grep "^diff"Was wondering if there's something I missed...
984
Find what file changed in a commit To find out which files changed in a given commit, use the git log --raw command.
To see the changes between two commits, you can use git diff ID1.. ID2 , where ID1 and ID2 identify the two commits you're interested in, and the connector .. is a pair of dots. For example, git diff abc123.. def456 shows the differences between the commits abc123 and def456 , while git diff HEAD~1..
To compare the current branch against main branch:
$ git diff --name-status main To compare any two branches:
$ git diff --name-status firstbranch..yourBranchName There is more options to git diff in the official documentation (and specifically --name-status option).
74
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
