From c47ce5568e39c5fcb80ed2b5be997065f4f25979 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Mon, 15 Jan 2018 10:08:38 -0500 Subject: [PATCH] dropping rebase as default pull seems to lose too much history, even with a merge --no-ff when bringing a release in. --- scripts/rev_control/version_control.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 ############## -- 2.34.1