I am using Git for my project and trying to follow best practice:

  1. I work on a topic branch
  2. When ready, I merge the topic branch into my dev branch using git merge --squash. This keeps my dev branch clean.
  3. Whenever the dev branch is stable and the team decides it's time for a release, we merge the dev branch into the master branch, without using squash, and tag that commit as a version release.

This should keep our history, and using gitk, we can see where all of the commits come in. However, I want to be able to see only the commits applied to the master branch. I have tried:

git log master
git show-branch

None of these show just the history of the master branch. Is there a way to easily do this?

git branching-and-merging git-log
Edit
Report