diff -r 60802bba1090 -r 44c4ed4ad032 mercurial/configitems.py --- a/mercurial/configitems.py Sat Oct 14 01:09:46 2017 +0200 +++ b/mercurial/configitems.py Fri Oct 13 23:00:31 2017 +0200 @@ -1085,3 +1085,16 @@ coreconfigitem('worker', 'numcpus', default=None, ) + +# Rebase related configuration moved to core because other extension are doing +# strange things. For example, shelve import the extensions to reuse some bit +# without formally loading it. +coreconfigitem('commands', 'rebase.requiredest', + default=False, +) +coreconfigitem('experimental', 'rebaseskipobsolete', + default=True, +) +coreconfigitem('rebase', 'singletransaction', + default=False, +)