equal
deleted
inserted
replaced
199 default='auto', |
199 default='auto', |
200 ) |
200 ) |
201 coreconfigitem('color', 'pagermode', |
201 coreconfigitem('color', 'pagermode', |
202 default=dynamicdefault, |
202 default=dynamicdefault, |
203 ) |
203 ) |
|
204 _registerdiffopts(section='commands', configprefix='commit.interactive.') |
204 coreconfigitem('commands', 'grep.all-files', |
205 coreconfigitem('commands', 'grep.all-files', |
205 default=False, |
206 default=False, |
206 ) |
207 ) |
207 coreconfigitem('commands', 'resolve.confirm', |
208 coreconfigitem('commands', 'resolve.confirm', |
208 default=False, |
209 default=False, |
211 default=False, |
212 default=False, |
212 ) |
213 ) |
213 coreconfigitem('commands', 'resolve.mark-check', |
214 coreconfigitem('commands', 'resolve.mark-check', |
214 default='none', |
215 default='none', |
215 ) |
216 ) |
|
217 _registerdiffopts(section='commands', configprefix='revert.interactive.') |
216 coreconfigitem('commands', 'show.aliasprefix', |
218 coreconfigitem('commands', 'show.aliasprefix', |
217 default=list, |
219 default=list, |
218 ) |
220 ) |
219 coreconfigitem('commands', 'status.relative', |
221 coreconfigitem('commands', 'status.relative', |
220 default=False, |
222 default=False, |