-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
clarification of fork honoring merge.ff ? #2303
Comments
It's just |
Now thats some response speed... |
Well, every fork command uses git config. We don't need to emphasize that, I think. |
Yeah, possibly, it was just that I got confused by chosing "default "Fast-forward if possible"" somehow... |
I am mostly working for basic git stuff in the terminal or integration of other tools and only for the less trivial things I use fork.
Therefore most of my configuration is really using plain git configuration and for one thing I am a little bit confused if fork is honoring it, or if it should be and somoething else might be wrong.
This ise merge.ff when set to false.
When trying to merge, fork offers the options ( --no-ff, --squash, --no-commit ) and has as default "Fast-forward if possible" without showing any command line argument.
Now after trying it out, the command being used in the logs seems to be just "git merge" and possibly using merge.ff but I just wanted to make sure that the setting really means "use git config"
The text was updated successfully, but these errors were encountered: