-1

I'm using git basic branch/merge to make feature changes. Typically during development there are several local commits. Some features take a fair amount of time complete so I periodically merge the master branch onto the feature branch so the feature branch stays somewhat in sync with master.

Once the feature is fully tested and ready to commit to master, I'd like to be able to review the changes specific to the feature branch that are not changes caused by periodically merging master.

Is there an easy way to see/review all feature branch specific changes before push to master (that aren't changes caused by periodically merging master)?

muzzelloader
  • 17
  • 1
  • There are many ways. Are you using a git GUI of some kind (say, gitkraken) and/or a centralized git service like GitHub, Bitbucket, etc? – msanford May 03 '21 at 20:18
  • Does this answer your question? [git visual diff between branches](https://stackoverflow.com/questions/12912985/git-visual-diff-between-branches) – msanford May 03 '21 at 20:20

1 Answers1

0

Considering you're already up-to-date with master, since you already did merges for that, you can use git diff to show all modifications that branch makes:

git diff master..<your branch>
Leonardo Dagnino
  • 2,914
  • 7
  • 28