From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 15 Jan 2018 15:08:38 +0000 (-0500)
Subject: dropping rebase as default pull
X-Git-Tag: 2.140.108^2~2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=c47ce5568e39c5fcb80ed2b5be997065f4f25979;p=feisty_meow.git

dropping rebase as default pull

seems to lose too much history, even with a merge --no-ff when bringing a release in.
---

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