diff options
| author | Erich Eckner <git@eckner.net> | 2022-01-08 11:28:17 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2022-01-08 11:28:17 +0100 |
| commit | 903c75a4c28e27879fc0715b2f36e2990eff6aa9 (patch) | |
| tree | 68ce36feed9537371216e487dfcf70b6f6348af9 /git-merge-diff.in | |
| parent | f97e9d6b37203d94cd34c64c099f401b154ec868 (diff) | |
| download | even-more-utils-903c75a4c28e27879fc0715b2f36e2990eff6aa9.tar.xz | |
fix names
Diffstat (limited to 'git-merge-diff.in')
| -rwxr-xr-x | git-merge-diff.in | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/git-merge-diff.in b/git-merge-diff.in new file mode 100755 index 0000000..ad885de --- /dev/null +++ b/git-merge-diff.in @@ -0,0 +1,11 @@ +#!/bin/bash + +up="$1" +shift +[ $# -gt 0 ] \ +&& [ -n "${1%%--*}" ] \ +&& down="$1" \ +&& shift \ +|| down=HEAD + +git diff "$(git merge-base "$up" "$down")" "$down" "$@" |