Signed-off-by: Yann Dirson <ydirson@altern.org>
esac
colordiff $diffopts \
esac
colordiff $diffopts \
+ -I '^index [0-9a-b]*..[0-9a-b]*' \
+ -I '^@@ .* @@' \
<($cmd1 "$1") <($cmd2 "$2") | less -RFX
<($cmd1 "$1") <($cmd2 "$2") | less -RFX
# in this case (unlike, eg., "pick --fold")
patchdir="$(git-rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
case $(stg log | head -n1) in
# in this case (unlike, eg., "pick --fold")
patchdir="$(git-rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
case $(stg log | head -n1) in
- *push\(c\)*) current_cmd="stg show //top.old" ;;
- *) current_cmd="stg show" ;;
+ *push\(c\)*) former="//top.old" ;;
+ *) former="//top" ;;
-colordiff "$@" \
- -I '^index [0-9a-b]*..[0-9a-b]*' \
- -I '^@@ .* @@' \
- <($current_cmd) <(stg diff -r//bottom) | less -RFX
+stg-mdiff -o "$*" \
+ $former //bottom..