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.

Sign up for GitHub

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

Jump to bottom

New preference mergenot #174

Open

g-raud wants to merge 2 commits into bcpierce00:master from g-raud:mergenot-new-preference

Contributor

g-raud commented Mar 12, 2018

This preference is client-local so it does not create incompatibilities.

One use is to disable all merges on the command line with -mergenot "Regex .*", for example to avoid interactive merges in batch mode.

Another use is to selectively disable merge options in a profile after generic merge patterns at the start of the file.

g-raud added 2 commits

March 12, 2018 13:17


          New client-local preference mergenot to override merge

7b0b6fb


          Add a warning about merge in the documentation of the preference batch

921a67b

hjmjohnson commented Sep 13, 2019

@g-raud Please rebase on master branch to ensure that this is still relevant and clean.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet