From 0d69a5b019284f07b6d2e1daa9992a96b8e9e532 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 09:46:20 +0100 Subject: [PATCH] git-rebase-interdiff (did also paste this into DC18 script bof, MIT) --- scripts/git-rebase-interdiff | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 scripts/git-rebase-interdiff 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 +/'^[-+][-+]' -- 2.30.2