chiark / gitweb /
git-rebase-interdiff (did also paste this into DC18 script bof, MIT) master
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 08:46:20 +0000 (09:46 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 08:46:20 +0000 (09:46 +0100)
scripts/git-rebase-interdiff [new file with mode: 0755]

diff --git a/scripts/git-rebase-interdiff b/scripts/git-rebase-interdiff
new file mode 100755 (executable)
index 0000000..37fe0be
--- /dev/null
@@ -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 +/'^[-+][-+]'