From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 08:46:20 +0000 (+0100)
Subject: git-rebase-interdiff (did also paste this into DC18 script bof, MIT)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=ian-dotfiles.git;a=commitdiff_plain;h=0d69a5b019284f07b6d2e1daa9992a96b8e9e532;ds=sidebyside

git-rebase-interdiff (did also paste this into DC18 script bof, MIT)
---

diff --git a/scripts/git-rebase-interdiff b/scripts/git-rebase-interdiff
new file mode 100755
index 0000000..37fe0be
--- /dev/null
+++ b/scripts/git-rebase-interdiff
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+gitdir=`git-rev-parse --git-dir`
+read <"$gitdir"/rebase-merge/stopped-sha stopped
+diff -u "$@" <(git show --oneline -p $stopped) <(git diff HEAD) \
+  | tail +3 \
+  | less +/'^[-+][-+]'