Allow reading COMMANDLINE_ARGS from file#69
Allow reading COMMANDLINE_ARGS from file#69ghost wants to merge 3 commits intoAUTOMATIC1111:masterfrom
Conversation
To avoid having custom settings clobbered by merge/pull/etc.
|
Does pulling do that? It's supposed to merge whatever you changed with incoming changes. |
Don't check for "-" at the beginning or end of strings, since that wouldn't be a valid "1-10" type numerical range anyways.
|
Pulling usually gets blocked: It can of course be handled by stash / pull / apply stash. But was thinking about something similar myself as to this PR and #140, which is trying to work around the same problem in a different way. But would be good to be able to overwrite the other settings as well (I need the PYTHON path configured as well). I suggest adding: to line 8 on webui.bat - then users can create that file with whatever overwrites they want. And then add webui.settings.bat to .gitignore. Would need a readme update as well, instructing users to add whatever they want in there. If there are more settings in webui.bat it should be added before, so that also could be modified. If you want @AUTOMATIC1111 I can create a separate PR for that (instead of hijacking this one - sorry for that). |
|
I merged the other solution adding a more customizable config file. |
To avoid having custom settings clobbered by merge/pull/etc.