equal
deleted
inserted
replaced
439 ------------ |
439 ------------ |
440 |
440 |
441 ``status.relative`` |
441 ``status.relative`` |
442 Make paths in :hg:`status` output relative to the current directory. |
442 Make paths in :hg:`status` output relative to the current directory. |
443 (default: False) |
443 (default: False) |
|
444 |
|
445 ``update.check`` |
|
446 Determines what level of checking :hg:`update` will perform before moving |
|
447 to a destination revision. Valid values are ``abort``, ``none``, |
|
448 ``linear``, and ``noconflict``. ``abort`` always fails if the working |
|
449 directory has uncommitted changes. ``none`` performs no checking, and may |
|
450 result in a merge with uncommitted changes. ``linear`` allows any update |
|
451 as long as it follows a straight line in the revision history, and may |
|
452 trigger a merge with uncommitted changes. ``noconflict`` will allow any |
|
453 update which would not trigger a merge with uncommitted changes, if any |
|
454 are present. |
|
455 (default: ``linear``) |
444 |
456 |
445 ``update.requiredest`` |
457 ``update.requiredest`` |
446 Require that the user pass a destination when running :hg:`update`. |
458 Require that the user pass a destination when running :hg:`update`. |
447 For example, :hg:`update .::` will be allowed, but a plain :hg:`update` |
459 For example, :hg:`update .::` will be allowed, but a plain :hg:`update` |
448 will be disallowed. |
460 will be disallowed. |