Question

For a web site, I have master and staging, I have worked on staging for about 10 days. How do I tell for sure what has changed since my last merge, or when that merge was? Most of the merges I have done end up being FFs so I can’t log them like git merge branch -m 'merging staging' (git reports it ignored -m). I usually merge master into staging for testing before merging staging into master for more testing and deployment.

I could tag each one but I’m worried about the clutter of doing that for merges. What I’d like to know is “roughly, what changed since my last merge of staging into master?” Then I could make sure I spent extra time investigating those changes in the final examination. Sometimes co-workers make changes I hadn’t noticed until this stage.

I suppose since staging->into->master merges are rare, I could tag them and then do a “git whatchanged tag” but I’m hoping there is a non-tag way to do it. Thanks.

Answer 1

Try this, it will select the last branch where the commit message starts with "Merge":

git show :/^Merge

Here‘s a website with a few git tips that might help you out.