Merge branch 'dev' of feistymeow.org:feisty_meow into dev

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index d74fe1bd67c43c713249809e0bcbf0a991cb4b0a..b1035c53549f633fdf1c23de8872abc7f0603938 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -379,6 +379,8 @@ function do_careful_git_update()
   show_branch_conditionally "$this_branch"
 
   # this code is now doing what i have to do when i repair the repo.  and it seems to be good so far.
+  # note that we allow the local branch to be merged with its remote counterpart; otherwise we would
+  # miss changes that happened elsewhere which should be seen in our local copy.
   local branch_list=$(all_branch_names)
   local bran
   for bran in $branch_list; do

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
 "
 
 ##############