diff options
| author | Erich Eckner <git@eckner.net> | 2022-01-08 11:19:48 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2022-01-08 11:19:48 +0100 |
| commit | 0ccea4da66dc4cae98b640e4ad906f429e3a353b (patch) | |
| tree | 232e23d2ec9bc7ad998c64898e661b72956e0d39 /git-merge-diff | |
| parent | 522c8cb129904ec9d5098a880fcc1d2bc942b846 (diff) | |
| download | even-more-utils-0ccea4da66dc4cae98b640e4ad906f429e3a353b.tar.xz | |
add some useful git commands
Diffstat (limited to 'git-merge-diff')
| -rwxr-xr-x | git-merge-diff | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/git-merge-diff b/git-merge-diff new file mode 100755 index 0000000..ad885de --- /dev/null +++ b/git-merge-diff @@ -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" "$@" |