chiark
/
gitweb
/
~ian
/
ian-dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-rebase-interdiff (did also paste this into DC18 script bof, MIT)
[ian-dotfiles.git]
/
scripts
/
git-rebase-interdiff
diff --git a/scripts/git-rebase-interdiff
b/scripts/git-rebase-interdiff
new file mode 100755
(executable)
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 +/'^[-+][-+]'