From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 3 Jan 2018 16:56:10 +0000 (-0500)
Subject: trying without --no-ff
X-Git-Tag: 2.140.107^2~2^2~10^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=5f77718fdcb9dfc44f46e0202fdccbce9fd7b8d3;hp=5f77718fdcb9dfc44f46e0202fdccbce9fd7b8d3;p=feisty_meow.git

trying without --no-ff

the fast forward feature seems important to avoid unnecessary merge messages from checkin.  we need to be careful at merge time with a branch to say: git merge --no-ff <thebranch>
because otherwise we would lose all the changes that occurred on the branch.  but remembering every trivial merge, even those without contents, is not good, so --no-ff needs to be dumped for most pulls.
---