Its a good idea. Go ahead and change it. Gesendet mit meinem HTC
----- Reply message ----- Von: "Kris Craig" <kris.cr...@gmail.com> An: "Simon Schick" <simonsimc...@googlemail.com> Cc: "David Soria Parra" <d...@php.net>, <internals@lists.php.net> Betreff: [PHP-DEV] php-src is now on git Datum: Mo., Mär. 19, 2012 19:58 Simon, On Mon, Mar 19, 2012 at 11:55 AM, Simon Schick <simonsimc...@googlemail.com>wrote: > 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 > Yes that's a great recommendation and it should definitely be included IMHO! However, the merge.ff option is relatively new and is not available in many older Git clients that are still in use. So the --no-ff tag will still probably be necessary for some people. Perhaps we should recommend both, or would that make things too confusing? --Kris
