rafaelstz
3/26/2019 - 7:56 PM

Git useful commands

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)