git flow - how to merge feature branches with --no-ff -


i've started using git flow utility. see, when i'm finishing feature, merges develop branch, without using --no--ff flag. i'd use it, can see development workflow/history in git gui tool (e.g. gitk). there way config it, or patch it, merging feature branches --no-ff flag?

i found fork, has support of merging features --no-ff https://github.com/petervanderdoes/gitflow


Comments

Post a Comment

Popular posts from this blog

javascript - RequestAnimationFrame not working when exiting fullscreen switching space on Safari -

request animation frame stops working when exiting fullscreen clicking on original space's safari window. fine if fullscreen mode canceled escape key or calling cancelfullscreen(). steps reproduce: open https://dl.dropboxusercontent.com/u/769042/prezi/safari-fullscreen.html click "draw raf", kittie appears click "fullscreen", go fullscreen click "draw raf", kittie appears go space original safari was, showing "click exit fullscreen mode", click anywhere, out fullscreen click "draw raf", nothing happens what handling click calling: window.requestanimationframe(draw); which draws on canvas context: function draw() { ctx.drawimage(img, math.random()*500|0, math.random()*400|0, 100, 100); } i checked .hidden , .visibilitystate, updated correctly. tested on osx 10.9.3, safari 7.0.4 (9537.76.4). has workaround/solution other switching old settimeout? this sounds webkit bug 88940 : using reque...
Read more

linux - phpmyadmin, neginx error.log - Check group www-data has read access and open_basedir -

i have message on phpmyadmin website the phpmyadmin configuration storage not configured, extended features have been deactivated. find out why click here. on 'click here' page have this: page printscreen my nginx error are: 2014/06/27 15:08:15 [error] 4922#0: *886 fastcgi sent in stderr: "php message: phpmyadmin: failed load /var/lib/phpmyadmin/blowfish_secret.inc.php check group www-data has read access , open_basedir restrictions. php message: phpmyadmin: failed load /var/lib/phpmyadmin/config.inc.php check group www-data has read access , open_basedir restrictions.2014/06/27 15:17:07 [error] 5119#0: *939 fastcgi sent in stderr: "php message: phpmyadmin: failed load /var/lib/phpmyadmin/blowfish_secret.inc.php check group www-data has read access , open_basedir restrictions. php message: phpmyadmin: failed load /var/lib/phpmyadmin/config.inc.php check group www-data has read access , open_basedir restrictions" while reading response...
Read more