Last active
May 20, 2020 13:45
-
-
Save robmiller/5350160 to your computer and use it in GitHub Desktop.
Want to find out what changes were introduced by a particular merge commit? Hey, so do I! ALL THE TIME. These aliases will do that.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # `git merge-log` shows the commits that were introduced in a given merge | |
| # `git merge-diff` shows the actual changes that were introduced by a given merge | |
| # Both commands accept an optional commitish; if ommitted, the last merge commit is used | |
| merge-span = "!f() { echo $(git log -1 $2 --merges --pretty=format:%P | cut -d' ' -f1)$1$(git log -1 $2 --merges --pretty=format:%P | cut -d' ' -f2); }; f" | |
| merge-log = "!git log `git merge-span .. $1`" | |
| merge-diff = "!git diff `git merge-span ... $1`" | |
| merge-difftool = "!git difftool `git merge-span ... $1`" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment