Thank you - I need it after the merge completes.
Lionel B. Dyck <sdg>< Website: http://www.lbdsoftware.com "Worry more about your character than your reputation. Character is what you are, reputation merely what others think you are." - John Wooden -----Original Message----- From: [email protected] <[email protected]> On Behalf Of Konstantin Khomoutov Sent: Tuesday, February 4, 2020 8:54 AM To: [email protected] Subject: Re: [git-users] Identifying the files updated during a merge? On Fri, Jan 31, 2020 at 11:30:57AM -0800, Lionel Dyck wrote: > I have a requirement to report which specific files are updated during > a merge. > > What I currently do is: > git merge -v --no-commit --no-ff' bname > > That tells me about deletes but nothing else > > Then I do > git commit -m "Merge bname > > I've tried adding -v to both with no joy. > > I need this information to reduce the amount of copying that we're > doing when a merge completes as we keep a non-git copy for auditing. What I failed to understand from your question is that whether you need that information at the time of the merge (say, when a message for this merge commit is created) or after the merge is completed. If we're talking about the latter, then it's as simple as git show --name-status or git show --name-status HEAD (or any "commit-ish" referring to that particular merge commit). The "--name-status" command-line option shows the status of the modified files; if you only need their names, use "--name-only". Please refer to the `git show` and `git diff` manual pages for more info. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/20200204145333.vlm4dtr74oob3tmw%40carbon. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/013401d5db6b%2480da2020%24828e6060%24%40gmail.com.
