git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 7/8] Add contrib/stg-mdiff: display diffs of diffs.

From
Yann Dirson <ydirson@altern.org>
Date
Mar 1, 2007, 23:04 UTC
Message-ID
<20070301230410.32459.93054.stgit@gandelf.nowhere.earth>
In-Reply-To
<20070301225651.32459.89156.stgit@gandelf.nowhere.earth>
Signed-off-by: Yann Dirson <ydirson@altern.org>
---
 contrib/stg-mdiff |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/contrib/stg-mdiff b/contrib/stg-mdiff
new file mode 100755
index 0000000..cd0c678
--- /dev/null
+++ b/contrib/stg-mdiff
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+# stg-mdiff - display meta-diffs, ie. diffs of diffs
+
+# Main use: show evolutions of a patch.
+# eg. stg-mdiff foo@stable foo
+#     stg-mdiff foo 012345567ABCD # sha1 for "foo" as integrated upstream
+
+# Copyright (c) 2007 Yann Dirson <ydirson@altern.org>
+# Subject to the GNU GPL, version 2.
+
+usage()
+{
+    echo "Usage: $(basename $0) <patch1> <patch2>"
+    exit 1
+}
+
+if [ "$#" != 2 ]; then
+    usage
+fi
+
+colordiff -u <(stg show "$1") <(stg show "$2") | less -RFX
Previous: Yann DirsonNext: Yann Dirson
Message 8 of 9 in “My set of stgit helper scripts (update)”
  1. 0/8 My set of stgit helper scripts (update)Yann Dirson, Mar 1, 2007
  2. 1/8 Add contrib/stg-whatchanged: look at what would be changed by refreshing.Yann Dirson, Mar 1, 2007
  3. 2/8 Add contrib/stg-show-old: show old version of a patch.Yann Dirson, Mar 1, 2007
  4. 3/8 Add contrib/stg-fold-files-from: pick selected changes from a patch above current oneYann Dirson, Mar 1, 2007
  5. 4/8 Add contrib/stg-swallow: completely merge an unapplied patch into current oneYann Dirson, Mar 1, 2007
  6. 5/8 Add contrib/stg-cvs: helper script to manage a mixed cvs/stgit working copyYann Dirson, Mar 1, 2007
  7. 6/8 Add contrib/stg-gitk: helper script to run gitkYann Dirson, Mar 1, 2007
  8. 7/8 Add contrib/stg-mdiff: display diffs of diffs.Yann Dirson, Mar 1, 2007
  9. 8/8 Add contrib/stg-sink: sink a patch to given location (mirrors float).Yann Dirson, Mar 1, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.