stopped redundant merges, added reconfigure note

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index d74fe1bd67c43c713249809e0bcbf0a991cb4b0a..e1cb4192d4bcd8de812c39bf38e44bcb31fb8686 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -383,6 +383,10 @@ function do_careful_git_update()
   local bran
   for bran in $branch_list; do
 #    echo "synchronizing remote branch: $bran"
+    if [ "$this_branch" == "$bran" ]; then
+      echo "skipping redundant update on initial branch: $bran"
+      continue;
+    fi
     git checkout "$bran" | $TO_SPLITTER
     promote_pipe_return 0
     test_or_die "git switching checkout to remote branch: $bran"

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 2717b3a65d7a45abb1ee19fe16a436659e2884f4..9c83a588a97d90823ce2dc3f9001e31a14b1ecab 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -285,6 +285,9 @@ echo "
 
 
 Thanks for revamping your cakelampvm.  :-)
+
+You may want to update your current shell's feisty meow environment by typing:
+  reconfigure_feisty_meow
 "
 
 ##############