blob: 3092dc19cb5aadc4b860e4ddd2f6c5b7dd4e80bd (
plain)
1
2
3
4
5
6
7
8
9
10
|
#!/bin/bash
# by Ian Jackson 2018, licensed MIT
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 +/'^[-+][-+]'
|