summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
Commit message (Expand)AuthorAgeFilesLines
* Put back the deletion of TEMPROOT/etc/passwd.dougb2003-03-051-1/+1
* Better handle the recent (desirable) change to create login.conf.db atdougb2003-03-051-4/+4
* Try another solution for not expanding a CVS tag.dougb2003-02-271-1/+1
* Try to fix two problems with the -I example. One is the fact that wedougb2003-02-101-1/+1
* * Update copyright year.dougb2003-02-051-5/+6
* * Update copyright year.dougb2003-02-051-2/+5
* Backout last commit by request.dillon2003-01-281-44/+11
* Commit simple mergemaster changes to make the UI more deterministicdillon2003-01-251-11/+44
* Don't use NO_MAKEDEV* option, its the default now.phk2002-10-221-1/+1
* Suppress spurious warning messages about rm -rf TEMPROOT failingdougb2002-08-051-3/+3
* Fix a couple DESTDIR related problems. Credit for the "Only in" sectiondougb2002-08-051-2/+2
* Correct links to Handbook's pages, old URLs does not work anymore.blackend2002-07-301-1/+1
* The .Nm utilitycharnier2002-07-141-6/+10
* * Handle all flags, not just schgdougb2002-06-301-3/+8
* Add 'chflags -R noschg' to the deletion process for the TEMPROOTdougb2002-06-261-1/+2
* Go back to taking the user's umask into account. Thanks to Alfred fordougb2002-06-101-23/+31
* * Use the new stat(1) to get mode information from the files wedougb2002-06-061-34/+33
* Actually accept the default argument to SCREEN_WIDTH.dougb2002-05-281-0/+3
* * Fix a small typo, thanks to olgenidougb2002-05-041-1/+4
* * Add some niceties to make the -p option quieter, and better behaveddougb2002-05-041-5/+28
* Solve the problem of spuriously comparing files that were createddougb2002-04-081-0/+3
* Document the two new options, pre buildworld mode anddougb2002-04-081-1/+12
* Improve grep'ing for variables in make.conf and rc.conf*.dougb2002-02-251-4/+4
* * Add a feature to do a "pre {build|install}world" check of (so far)dougb2002-02-241-26/+90
* * Update (c)dougb2002-02-121-2/+5
* * Update (c)dougb2002-02-121-1/+3
* Hopefully squish the problem of mm creating sendmail files indougb2001-08-071-1/+3
* Perform a major cleanup of the usr.sbin Makefiles.obrien2001-07-201-0/+1
* mdoc(7) police: removed HISTORY info from the .Os call.ru2001-07-101-1/+1
* mdoc(7) police: remove extraneous .Pp before and/or after .Sh.dd2001-07-091-2/+0
* mdoc(7) police:ru2001-07-051-6/+7
* Work around the problem in RELENG_4 where the file doesn't actuallydougb2001-06-201-7/+13
* Add the last of the compatibility mods from openbsd. Neatly, thedougb2001-05-301-9/+14
* Various fixes, including suggestions from some thoughtful folks, thanks.dougb2001-05-281-18/+47
* Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrcdougb2001-05-281-1/+6
* Be more consistent with the terminology, referring to "temporary anddougb2001-05-281-2/+2
* Fix a problem when user selects -a (auto run) but we encounter a filedougb2001-05-281-1/+16
* Whitespace only changes to try and fit a little better into 80 columns.dougb2001-05-281-15/+20
* mdoc(7) police: normalize .Nd.ru2001-04-181-1/+1
* beforeinstall -> SCRIPTS.ru2001-04-071-4/+1
* Change NO_MAKEDEV to a finer granularity method:asmodai2001-03-291-1/+1
* - Backout botched attempt to introduce MANSECT feature.ru2001-03-261-1/+1
* * Add two requested features, source'ing of /etc/mergemaster.rc, anddougb2001-03-052-17/+66
* Prepare for mdoc(7)NG.ru2000-12-271-4/+3
* mdoc(7) police: use the new features of the Nm macro.ru2000-11-201-1/+1
* mdoc(7) police: use certified section headers wherever possible.ru2000-11-171-1/+1
* Use Fx macro wherever possible.ru2000-11-141-1/+2
* * Reduce diffs to RELENG_4 by specifying a full path to sysctldougb2000-11-092-4/+10
* Reorder one of the new features based on experience. Since the numberdougb2000-11-011-12/+12
* Add several new features, reorder some code, and continue with thedougb2000-10-302-97/+194
OpenPOWER on IntegriCloud