diff options
| author | dougb <dougb@FreeBSD.org> | 2008-06-11 18:54:06 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2008-06-11 18:54:06 +0000 |
| commit | caec8ca31895494e3aa869e4a120eb00f6fda2ea (patch) | |
| tree | 9d131a5ba976f98085d7d810500ccbddf57bae0e /usr.sbin | |
| parent | 52a3340f63647b2c81ac86976fc52fa1884db9b6 (diff) | |
| download | FreeBSD-src-caec8ca31895494e3aa869e4a120eb00f6fda2ea.zip FreeBSD-src-caec8ca31895494e3aa869e4a120eb00f6fda2ea.tar.gz | |
Document the AUTO_UPGRADE (-U) knob for .mergemasterrc
Submitted by: mezz
No Cookie For: gordon :)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 63cf2ab..1d7b260 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -312,6 +312,9 @@ with all values commented out: # Automatically install files that do not exist on the system already #AUTO_INSTALL= # +# Automatically upgrade files that have not been user modified +#AUTO_UPGRADE= +# # Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf #COMP_CONFS=yes # |
