From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 15 Jan 2018 16:35:34 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: 2.140.108^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=02c681cf298b3ebe31b9d7898989dad822080cfc;hp=df45b967961679bb5a9f3a758499fde8d04efd64;p=feisty_meow.git

Merge branch 'master' into dev

accidental checkin to master of a dev change, merging back.
---

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 8ec547f3..0c8cec27 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -20,7 +20,10 @@ if (( $gitvertest >= 11 )); then
   # auto-stash is not available until 2.6 for git, but ubuntu is misreporting or using a
   # differing version number somehow.  we are sure autostash was missing on ubuntu xenial
   # with git 2.7.4 and it's definitely present in zesty with git at 2.11.
-  PULL_ADDITION='--rebase --autostash'
+#  PULL_ADDITION='--rebase --autostash'
+#although initially attractive, above set of flags seems to lose history we don't want to
+#lose.
+PULL_ADDITION=
 fi
 
 ##############