From: Yann Dirson <yann.dirson@xxxxxxxxx>
We can now compare arbitrary deltas, not just single commits.
Signed-off-by: Yann Dirson <ydirson@xxxxxxxxxx>
---
contrib/stg-mdiff | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/contrib/stg-mdiff b/contrib/stg-mdiff
index cd0c678..9bb324a 100755
--- a/contrib/stg-mdiff
+++ b/contrib/stg-mdiff
@@ -12,7 +12,7 @@ set -e
usage()
{
- echo "Usage: $(basename $0) <patch1> <patch2>"
+ echo "Usage: $(basename $0) <from1>..[<to1>]|<patch1> <from2>..[<to2>]|<patch2>"
exit 1
}
@@ -20,4 +20,13 @@ if [ "$#" != 2 ]; then
usage
fi
-colordiff -u <(stg show "$1") <(stg show "$2") | less -RFX
+case "$1" in
+*..*) cmd1="stg diff" ;;
+*) cmd1="stg show" ;;
+esac
+case "$2" in
+*..*) cmd2="stg diff" ;;
+*) cmd2="stg show" ;;
+esac
+
+colordiff -u <($cmd1 "$1") <($cmd2 "$2") | less -RFX
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
