Yes, it is possible to make "ff-only" the default setting for "git pull" but not for "git merge".
You can set the default behavior for "git pull" as follows:
git config --global pull.ff only
This sets the default setting for "git pull" to perform fast-forward merges only.
To override this setting for a specific merge, you can use the "--no-ff" option with the "git merge" command:
git merge --no-ff <branch>
This will force a non-fast-forward merge even if the default setting is "ff-only".
Please start posting anonymously - your entry will be published after you log in or create a new account. This space is reserved only for answers. If you would like to engage in a discussion, please instead post a comment under the question or an answer that you would like to discuss
Asked: 2023-06-22 23:18:06 +0000
Seen: 10 times
Last updated: Jun 22 '23
What is the method to make a datalogger stop when there is no movement through the use of NET()?
How can one make antd form.setFieldsValue render when Form.Item has multiple elements?
How can Dependabot pull requests be ignored or excluded in GitHub Actions?
Is it possible to retrieve 'official' images from Docker Hub using Podman pull?