diff options
| author | dougb <dougb@FreeBSD.org> | 2001-03-05 10:13:21 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2001-03-05 10:13:21 +0000 |
| commit | b958b846b0dd0f260c6a73f7f68f7c5fc1114b2c (patch) | |
| tree | 2f4f6ff3ce6443fafc36c1b0b9f5c95a02cf4d6c /usr.sbin/mergemaster/mergemaster.8 | |
| parent | 23b112e09e2b263f860e20bdf6f53477a279ba89 (diff) | |
| download | FreeBSD-src-b958b846b0dd0f260c6a73f7f68f7c5fc1114b2c.zip FreeBSD-src-b958b846b0dd0f260c6a73f7f68f7c5fc1114b2c.tar.gz | |
* Add two requested features, source'ing of /etc/mergemaster.rc, and
asking the user to actually run the recommended commands related
to installation of files such as aliases or login.conf.
* Return to using grep for CVS $Id comparison. Using ident caused too
many problems for people with local CVS/RCS tags in their stuff.
Attempt to make portability a little easier to maintain in spite of
this change by defining the name of the tag to search for. This
is a slightly different change that solves the problem in the PR.
PR: bin/24564
Submitted by: Tony Finch <dot@dotat.at>
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.8')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 932eba7..646bc48 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998-2000 Douglas Barton +.\" Copyright (c) 1998-2001 Douglas Barton .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 30, 2000 +.Dd February 5, 2001 .Dt MERGEMASTER 8 .Os FreeBSD .Sh NAME @@ -137,6 +137,12 @@ Because the named scripts are sourced from within .Nm , all of the script's variables are available for use in your custom script. +You can also use +.Pa /etc/mergemaster.rc +which will be read before +.Pa .mergemasterrc . +Options specified on the command line are updated last, +and therefore can override both files. .Pp The options are as follows: .Bl -tag -width Fl |
