Skip to content

Instantly share code, notes, and snippets.

@robmiller

robmiller/.gitconfig

Last active May 20, 2020 13:45
Show Gist options
  • Star 5 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save robmiller/5350160 to your computer and use it in GitHub Desktop.
Save robmiller/5350160 to your computer and use it in GitHub Desktop.
Download ZIP
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.
Raw
.gitconfig
# `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