summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.sh
Commit message (Expand)AuthorAgeFilesLines
* Hide the creation and population of the temprootdougb2010-05-141-5/+5
* Add support run services_mkdb(8).nork2010-05-041-0/+14
* Make it more clear in the docs that -a is not compatible with -iFU,dougb2010-03-141-1/+13
* Make -U once again honor -D after my change to consolidate settingdougb2010-01-221-5/+5
* Oops, deleted one line too many. Add back the null case for IGNORE_MOTDdougb2010-01-151-0/+1
* Now that we've officially arrived at FreeBSD 9, remove the IGNORE_MOTDdougb2010-01-151-5/+2
* Update copyright datedougb2010-01-081-22/+20
* If we are using -p it does not make any sense to even create thedougb2009-12-311-2/+2
* Add some patches contributed by jhb:dougb2009-12-301-23/+34
* Fix a problem with how mergemaster handles the hard links for /.cshrcdougb2009-12-191-13/+20
* Fix an indentation issue, no functional changesdougb2009-12-191-22/+22
* In the places where find is used that the user may see the results,dougb2009-12-191-3/+3
* Over time things that used to be files/directories/links can changedougb2009-12-121-2/+59
* Simplify handling of MTREEFILE relative to DESTDIRdougb2009-12-111-7/+8
* 1. Update the message that prints out for -U when the mtree database doesdougb2009-06-091-7/+7
* Enhance the safety of the -U option:dougb2009-05-161-9/+13
* Add -L to the mtree invocation to chase symbolic links that are presentdougb2009-05-161-1/+1
* Don't tempt svn to expand the example $FreeBSD stringsdougb2009-03-231-1/+1
* 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
* 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
* 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
* 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 auto upgrade capability to mergemaster.gordon2006-04-291-1/+86
* Add a -A argument to mergemaster to allow explicitly specifying anrwatson2006-02-041-7/+11
* Change the default for deleting stale files from yes (which violatesdougb2005-12-211-5/+5
* 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
* 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
* * Add a -P (Preserve) option, which saves a copy of files that you replace.dougb2003-05-021-20/+50
* 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
* * Update copyright year.dougb2003-02-051-5/+6
* 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
OpenPOWER on IntegriCloud