summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
Commit message (Expand)AuthorAgeFilesLines
* 1. Update for new -F option from r189992.dougb2009-03-181-22/+42
* Add a new -F option to automatically install files that differdougb2009-03-181-2/+19
* 1. Clean up usage() output a bit by grouping options that take an argumentdougb2009-03-131-4/+5
* When using the -D option:dougb2009-03-131-4/+4
* Instead of using obj and all targets which are not cross-build aware,dougb2009-01-041-3/+4
* Add a note to the -m option indicating that you should now specify src/dougb2009-01-021-1/+9
* Simplify the code a little by moving the working part ofdougb2009-01-021-8/+12
* Only check for 'nodev' in fstab if that file existsdougb2009-01-021-8/+10
* For IGNORE_FILES delete the version in the TEMPROOT, not the base.dougb2009-01-021-1/+1
* General Improvementsdougb2009-01-011-19/+31
* Maintenance and updatesdougb2009-01-011-50/+85
* Revert 184781, 184804, and 184832 (automatic installation of filesdougb2009-01-011-19/+0
* No need to run rm ${COMPFILE} after mm_install() - mm_install()sobomax2008-11-111-1/+0
* Improve on 184781 - instead of ignoring the file when the only differencesobomax2008-11-091-2/+8
* Ignore files that only differ in CVS Id tag.sobomax2008-11-091-0/+14
* Document the AUTO_UPGRADE (-U) knob for .mergemasterrcdougb2008-06-111-0/+3
* Remove ISDN4BSD (I4B) from HEAD as it is not MPSAFE andbz2008-05-261-2/+2
* In the following scenario:dougb2007-12-211-0/+7
* Add missed SYNOPSIS flag for auto upgrade.gordon2006-04-301-1/+1
* Add auto upgrade capability to mergemaster.gordon2006-04-292-1/+88
* Add a -A argument to mergemaster to allow explicitly specifying anrwatson2006-02-042-8/+17
* Change the default for deleting stale files from yes (which violatesdougb2005-12-211-5/+5
* Point to the right path under www.freebsd.org/doc for the Handbookkeramida2005-07-201-1/+1
* Expand contractions.ru2005-02-131-1/+1
* Sort sections.ru2005-01-181-34/+34
* Added the EXIT STATUS section where appropriate.ru2005-01-171-1/+1
* Mechanically kill hard sentence breaks.ru2004-07-021-3/+7
* In the case where /etc/rc.d/ is empty, do not bogusly ask the user ifdougb2004-03-071-1/+1
* Set MAKEOBJDIRPREFIX in the environment, like God intended. Thisru2004-03-061-3/+3
* mergemaster -p (pre-world) doesn't populate /etc/rc.d, which led to adougb2004-01-041-5/+4
* * Update copyrightdougb2004-01-011-2/+51
* Use the actual build target (all), since relying on the build as adougb2003-08-041-0/+1
* Remove MAINTAINER line in favor of the entry in src/MAINTAINERSdougb2003-06-041-2/+0
* Preserve directory structure in PRESERVED_FILES_DIR to avoiddougb2003-05-031-2/+2
* rc.sendmail should not have been removed yet.dougb2003-05-021-2/+2
* * Document the -P optiondougb2003-05-021-1/+17
* * Add a -P (Preserve) option, which saves a copy of files that you replace.dougb2003-05-021-20/+50
* style.Makefile(5)obrien2003-04-041-2/+2
* 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
OpenPOWER on IntegriCloud