Skip to content

Instantly share code, notes, and snippets.

@rafaelstz
Last active March 26, 2019 19:56
Show Gist options
  • Save rafaelstz/981fd984d5b6014374184352e322ed03 to your computer and use it in GitHub Desktop.
Save rafaelstz/981fd984d5b6014374184352e322ed03 to your computer and use it in GitHub Desktop.
### Show the last commits since the last merge
git log $(git merge-base --octopus $(git log -1 --merges --pretty=format:%P)).. --boundary
### Show all the files changed since the last merge via git diff
git diff --cc $M $M^1 $M^2 $(git merge-base $M^1 $M^2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment