dropping rebase as default pull
authorChris Koeritz <fred@gruntose.com>
Mon, 15 Jan 2018 15:08:38 +0000 (10:08 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 15 Jan 2018 15:08:38 +0000 (10:08 -0500)
commitc47ce5568e39c5fcb80ed2b5be997065f4f25979
tree3db41003b104ca80025ac7343eae07ed13b79fe9
parent416de6a3e53c423729483b92e3b316959be6677b
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