aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
Commit message (Expand)AuthorAgeFilesLines
...
* If we are using -p it does not make any sense to even create theDoug Barton2009-12-311-2/+2
* It's not necessary to include both Op and Fl for command line optionsDoug Barton2009-12-301-9/+11
* Document the DELETE_STALE_RC_FILES option introduced in r201291. This isDoug Barton2009-12-301-16/+19
* Add some patches contributed by jhb:Doug Barton2009-12-301-23/+34
* Fix a problem with how mergemaster handles the hard links for /.cshrcDoug Barton2009-12-191-13/+20
* Fix an indentation issue, no functional changesDoug Barton2009-12-191-22/+22
* In the places where find is used that the user may see the results,Doug Barton2009-12-191-3/+3
* Over time things that used to be files/directories/links can changeDoug Barton2009-12-121-2/+59
* Simplify handling of MTREEFILE relative to DESTDIRDoug Barton2009-12-111-7/+8
* 1. Update the message that prints out for -U when the mtree database doesDoug Barton2009-06-091-7/+7
* Enhance the safety of the -U option:Doug Barton2009-05-161-9/+13
* Add -L to the mtree invocation to chase symbolic links that are presentDoug Barton2009-05-161-1/+1
* Don't tempt svn to expand the example $FreeBSD stringsDoug Barton2009-03-232-4/+4
* 1. Update for new -F option from r189992.Doug Barton2009-03-181-22/+42
* Add a new -F option to automatically install files that differDoug Barton2009-03-181-2/+19
* 1. Clean up usage() output a bit by grouping options that take an argumentDoug Barton2009-03-131-4/+5
* When using the -D option:Doug Barton2009-03-131-4/+4
* Instead of using obj and all targets which are not cross-build aware,Doug Barton2009-01-041-3/+4
* Add a note to the -m option indicating that you should now specify src/Doug Barton2009-01-021-1/+9
* Simplify the code a little by moving the working part ofDoug Barton2009-01-021-8/+12
* Only check for 'nodev' in fstab if that file existsDoug Barton2009-01-021-8/+10
* For IGNORE_FILES delete the version in the TEMPROOT, not the base.Doug Barton2009-01-021-1/+1
* General ImprovementsDoug Barton2009-01-011-19/+31
* Maintenance and updatesDoug Barton2009-01-011-50/+85
* Revert 184781, 184804, and 184832 (automatic installation of filesDoug Barton2009-01-011-19/+0
* No need to run rm ${COMPFILE} after mm_install() - mm_install()Maxim Sobolev2008-11-111-1/+0
* Improve on 184781 - instead of ignoring the file when the only differenceMaxim Sobolev2008-11-091-2/+8
* Ignore files that only differ in CVS Id tag.Maxim Sobolev2008-11-091-0/+14
* Document the AUTO_UPGRADE (-U) knob for .mergemasterrcDoug Barton2008-06-111-0/+3
* Remove ISDN4BSD (I4B) from HEAD as it is not MPSAFE andBjoern A. Zeeb2008-05-261-2/+2
* In the following scenario:Doug Barton2007-12-211-0/+7
* Add missed SYNOPSIS flag for auto upgrade.Gordon Tetlow2006-04-301-1/+1
* Add auto upgrade capability to mergemaster.Gordon Tetlow2006-04-292-1/+88
* Add a -A argument to mergemaster to allow explicitly specifying anRobert Watson2006-02-042-8/+17
* Change the default for deleting stale files from yes (which violatesDoug Barton2005-12-211-5/+5
* Point to the right path under www.freebsd.org/doc for the HandbookGiorgos Keramidas2005-07-201-1/+1
* Expand contractions.Ruslan Ermilov2005-02-131-1/+1
* Sort sections.Ruslan Ermilov2005-01-181-34/+34
* Added the EXIT STATUS section where appropriate.Ruslan Ermilov2005-01-171-1/+1
* Mechanically kill hard sentence breaks.Ruslan Ermilov2004-07-021-3/+7
* In the case where /etc/rc.d/ is empty, do not bogusly ask the user ifDoug Barton2004-03-071-1/+1
* Set MAKEOBJDIRPREFIX in the environment, like God intended. ThisRuslan Ermilov2004-03-061-3/+3
* mergemaster -p (pre-world) doesn't populate /etc/rc.d, which led to aDoug Barton2004-01-041-5/+4
* * Update copyrightDoug Barton2004-01-011-2/+51
* 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