2012/3/19 Kris Craig <kris.cr...@gmail.com>: > Hey, > > Could we modify the workflow to recommend using the "--no-ff" switch when > merging in a feature branch? This is by and large the recommended approach > as it preserves the feature branch's commit history, making it > *much*easier to sort through complex features that contain numerous > commits. > > --Kris
Hi, Kris I'd instead suggest to execute the following command in the git-repository: git config --add merge.ff false Then you do not have to add --no-ff to every merge-command you're doing. You could even set it per branch if you want :) (just to round it up ..) http://stackoverflow.com/questions/2500296/can-i-make-fast-forwarding-be-off-by-default-in-git Bye Simon -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
