summaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
Commit message (Expand)AuthorAgeFilesLines
* Use the actual build target (all), since relying on the build as aDoug Barton2003-08-041-0/+1
* Remove MAINTAINER line in favor of the entry in src/MAINTAINERSDoug Barton2003-06-041-2/+0
* Preserve directory structure in PRESERVED_FILES_DIR to avoidDoug Barton2003-05-031-2/+2
* rc.sendmail should not have been removed yet.Doug Barton2003-05-021-2/+2
* * Document the -P optionDoug Barton2003-05-021-1/+17
* * Add a -P (Preserve) option, which saves a copy of files that you replace.Doug Barton2003-05-021-20/+50
* style.Makefile(5)David E. O'Brien2003-04-041-2/+2
* Put back the deletion of TEMPROOT/etc/passwd.Doug Barton2003-03-051-1/+1
* Better handle the recent (desirable) change to create login.conf.db atDoug Barton2003-03-051-4/+4
* Try another solution for not expanding a CVS tag.Doug Barton2003-02-271-1/+1
* Try to fix two problems with the -I example. One is the fact that weDoug Barton2003-02-101-1/+1
* * Update copyright year.Doug Barton2003-02-051-5/+6
* * Update copyright year.Doug Barton2003-02-051-2/+5
* Backout last commit by request.Matthew Dillon2003-01-281-44/+11
* Commit simple mergemaster changes to make the UI more deterministicMatthew Dillon2003-01-251-11/+44
* Don't use NO_MAKEDEV* option, its the default now.Poul-Henning Kamp2002-10-221-1/+1
* Suppress spurious warning messages about rm -rf TEMPROOT failingDoug Barton2002-08-051-3/+3
* Fix a couple DESTDIR related problems. Credit for the "Only in" sectionDoug Barton2002-08-051-2/+2
* Correct links to Handbook's pages, old URLs does not work anymore.Marc Fonvieille2002-07-301-1/+1
* The .Nm utilityPhilippe Charnier2002-07-141-6/+10
* * Handle all flags, not just schgDoug Barton2002-06-301-3/+8
* Add 'chflags -R noschg' to the deletion process for the TEMPROOTDoug Barton2002-06-261-1/+2
* Go back to taking the user's umask into account. Thanks to Alfred forDoug Barton2002-06-101-23/+31
* * Use the new stat(1) to get mode information from the files weDoug Barton2002-06-061-34/+33
* Actually accept the default argument to SCREEN_WIDTH.Doug Barton2002-05-281-0/+3
* * Fix a small typo, thanks to olgeniDoug Barton2002-05-041-1/+4
* * Add some niceties to make the -p option quieter, and better behavedDoug Barton2002-05-041-5/+28
* Solve the problem of spuriously comparing files that were createdDoug Barton2002-04-081-0/+3
* Document the two new options, pre buildworld mode andDoug Barton2002-04-081-1/+12
* Improve grep'ing for variables in make.conf and rc.conf*.Doug Barton2002-02-251-4/+4
* * Add a feature to do a "pre {build|install}world" check of (so far)Doug Barton2002-02-241-26/+90
* * Update (c)Doug Barton2002-02-121-2/+5
* * Update (c)Doug Barton2002-02-121-1/+3
* Hopefully squish the problem of mm creating sendmail files inDoug Barton2001-08-071-1/+3
* Perform a major cleanup of the usr.sbin Makefiles.David E. O'Brien2001-07-201-0/+1
* mdoc(7) police: removed HISTORY info from the .Os call.Ruslan Ermilov2001-07-101-1/+1
* mdoc(7) police: remove extraneous .Pp before and/or after .Sh.Dima Dorfman2001-07-091-2/+0
* mdoc(7) police:Ruslan Ermilov2001-07-051-6/+7
* Work around the problem in RELENG_4 where the file doesn't actuallyDoug Barton2001-06-201-7/+13
* Add the last of the compatibility mods from openbsd. Neatly, theDoug Barton2001-05-301-9/+14
* Various fixes, including suggestions from some thoughtful folks, thanks.Doug Barton2001-05-281-18/+47
* Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrcDoug Barton2001-05-281-1/+6
* Be more consistent with the terminology, referring to "temporary andDoug Barton2001-05-281-2/+2
* Fix a problem when user selects -a (auto run) but we encounter a fileDoug Barton2001-05-281-1/+16
* Whitespace only changes to try and fit a little better into 80 columns.Doug Barton2001-05-281-15/+20
* mdoc(7) police: normalize .Nd.Ruslan Ermilov2001-04-181-1/+1
* beforeinstall -> SCRIPTS.Ruslan Ermilov2001-04-071-4/+1
* Change NO_MAKEDEV to a finer granularity method:Jeroen Ruigrok van der Werven2001-03-291-1/+1
* - Backout botched attempt to introduce MANSECT feature.Ruslan Ermilov2001-03-261-1/+1
* * Add two requested features, source'ing of /etc/mergemaster.rc, andDoug Barton2001-03-052-17/+66