~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'proposed' of git://github.com/gustavh/stgit
[stgit]
/
contrib
/
stg-whatchanged
diff --git
a/contrib/stg-whatchanged
b/contrib/stg-whatchanged
index
afeda2c
..
f1f5308
100755
(executable)
--- a/
contrib/stg-whatchanged
+++ b/
contrib/stg-whatchanged
@@
-23,7
+23,7
@@
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
*push\(c\)*) former="//top.old" ;;
*) former="//top" ;;
case $(stg log | head -n1) in
*push\(c\)*) former="//top.old" ;;
*) former="//top" ;;