GIT GUI and merge using -no-ff option

I've been using GIT since last year and it is really very helpful ...

I have read a lot about how best to use branches, etc. I actually only have one problem, I am mainly using the GIT GUI

git-gui version 0.17.GITGUI
git version 1.8.0.msysgit.0

Tcl/Tk version 8.5.11

      

And I never found a simple merge option with the option --no-ff

Can this parameter be used? or set it as default in GIT GUI?

link: http://nvie.com/posts/a-successful-git-branching-model/

+3


source to share


1 answer


I can't find the setting in the GUI, but you can set it as the default behavior. Open a terminal window and set the parameter merge.ff

tofalse

:

$ git config --global merge.ff false

      



If you only want to set this for a specific repo, remove the flag --global

.

+7


source







All Articles