~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgit.el: Add 'm' as alias for stgit-mark
[stgit]
/
contrib
/
stg-whatchanged
diff --git
a/contrib/stg-whatchanged
b/contrib/stg-whatchanged
index
231f4f5
..
f1f5308
100755
(executable)
--- a/
contrib/stg-whatchanged
+++ b/
contrib/stg-whatchanged
@@
-23,13
+23,11
@@
fi
# Merges via "push" leave top=bottom so we must look at old patch
# in this case (unlike, eg., "pick --fold")
# Merges via "push" leave top=bottom so we must look at old patch
# in this case (unlike, eg., "pick --fold")
-patchdir="$(git
-
rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
+patchdir="$(git
rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
case $(stg log | head -n1) in
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
" ;;
esac
esac
-colordiff "$@" \
- -I '^index [0-9a-b]*..[0-9a-b]*' \
- -I '^@@ .* @@' \
- <($current_cmd) <(stg diff -r//bottom) | less -RFX
+stg-mdiff -o "$*" \
+ $former //bottom..