[beast/devel: 1/6] ROOT: mkrelease.sh: show how to fast-forward merge 'devel' after release

[Tim Janik <timj src gnome org>]

commit 9734314943261bbc314aebcecd653f134876076e
Author: Tim Janik <timj gnu org>
Date:   Sun Jan 20 03:16:11 2013 +0100

    ROOT: mkrelease.sh: show how to fast-forward merge 'devel' after release

 mkrelease.sh |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/mkrelease.sh b/mkrelease.sh
index 3f5cf85..589abbf 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -344,8 +344,10 @@ done
   msg2 ">" "$RLS"
   # push notes
   $needs_head_push && \
-    msg2 "Note, push HEAD with:         # git push origin" `git rev-list -n1 "$VERSION"`":master"
-  msg2 "Note, push tag with:          # git push origin '$VERSION'"
+    CHASH=`git rev-list -n1 "$VERSION"`
+    msg2 "Note, push HEAD with:      # git push origin $CHASH:master"
+    msg2 "Note, update 'devel' with: # git checkout devel && git merge --ff-only $CHASH"
+  msg2 "Note, push tag with:       # git push origin '$VERSION'"
   msg2 "Done."
   exit
 }