summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ec6ed33)
Signed-off-by: Yann Dirson <ydirson@altern.org>
# 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)/$(stg top)"
+patchdir="$(git-rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
if [ $(cat "$patchdir/bottom") = $(cat "$patchdir/top") ];
then
current_cmd="stg show //top.old"
if [ $(cat "$patchdir/bottom") = $(cat "$patchdir/top") ];
then
current_cmd="stg show //top.old"