Thread (2 messages) flat view 2 messages, 2 authors, 2020-07-07

RE: [PATCH v9] Support auto-merge for meld to follow the vim-diff behavior

From: <hidden>
Date: 2020-07-07 06:34:55

Hi Junio,

Thank you for your comments, and I made the changes in [PATH v10].
For `git config --bool ...`, with a `=` appending to the rerere.enabled will get reverse result, here are the commands.
$ echo [rerere] enabled >> .git/config
$ git config --bool rerere.enabled
true
$ echo [rerere] enabled = >> .git/config
$ git config --bool rerere.enabled
false

So in [PATH v10], it still try get the string value first, then detecting the ""(empty)/true/false/auto. 
That will cover most cases with one `git config...` calling for useAutoMerge is not configured or is configured properly.
Otherwise, it will try call `git config --bool ...` for checking more boolean configuration values.

Please review the [PATH v10], thank you.
https://lore.kernel.org/git/pull.781.v10.git.git.1594102679750.gitgitgadget@gmail.com/ (local)

Regards
Lin
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help