projects / feisty_meow.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a6717c0) | patch
trying without --no-ff
authorChris Koeritz <fred@gruntose.com>
Wed, 3 Jan 2018 16:56:10 +0000 (11:56 -0500)
committerChris Koeritz <fred@gruntose.com>
Wed, 10 Jan 2018 20:01:12 +0000 (15:01 -0500)
commit1e4b3bbad01aa1935f32dee3ae4a241e279675c9
tree3c265b3545ffe587a9b87c98950ec6a7412e1873tree | snapshot
parenta6717c076063772da7a05697254357a586fad650commit | diff
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.
scripts/rev_control/version_control.sh diff | blob | history