I am in the midst of a complex merge/rebase, because I would need to remove a huge amount of commits made by other people in interim branches.

I have 2 branches:

• master
• my-branch

I need to know the list of files that I personally edited in my-branch.

This merge is so complex that I think it is better if I: git checkout -b new-master and I replace all the files edited by me, and only then I will merge it with master.

To do that I need to: -check my-branch and get a list of all the files I edited in my-branch

Can anyone explain how to do that? It can be via terminal or also via IntelliJ step by step

CodePudding user response：

You can combine --format and --name-only of git log to get a list of files modified by you or any other author:

git log --author=youremailaddress --name-only --format='' master..my-branch

Add sort -u to remove duplicate file names from the output.