diff options
| author | dougb <dougb@FreeBSD.org> | 2002-04-08 09:49:40 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2002-04-08 09:49:40 +0000 |
| commit | bb1e5936636e87edca4220d7617198209dda8f2a (patch) | |
| tree | 21257cc4d51d945a5cecce97d0c2d54cd43100c7 /usr.sbin/mergemaster | |
| parent | ff74b91a12ea8706ee703f05bb1d031354f82aea (diff) | |
| download | FreeBSD-src-bb1e5936636e87edca4220d7617198209dda8f2a.zip FreeBSD-src-bb1e5936636e87edca4220d7617198209dda8f2a.tar.gz | |
Document the two new options, pre buildworld mode and
post-mm rc.conf[.local] comparisons.
Diffstat (limited to 'usr.sbin/mergemaster')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 0ac6ae3..66ac81d 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -32,7 +32,7 @@ .Nd merge configuration files, et al during an upgrade .Sh SYNOPSIS .Nm -.Op Fl scrvahi +.Op Fl scrvahipC .Op Fl m Ar /path/to/sources .Op Fl t Ar /path/to/temp/root .Op Fl d @@ -185,6 +185,17 @@ Display usage and help information. .It Fl i Automatically install any files that do not exist in the destination directory. +.It Fl p +Pre-buildworld mode. +Compares only files known to be essential to the sucess of +{build|install}world, +including +.Pa /etc/make.conf . +.It Fl C +After a standard +.Nm +run, +compares your rc.conf[.local] options to the defaults. .It Fl m Ar /path/to/sources Specify the path to the directory where you want to do the .Xr make 1 . |
