summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
Commit message (Expand)AuthorAgeFilesLines
* Make clear that the -U option can be dangerous. [1]dougb2011-08-092-6/+10
* mdoc: drop redundant .Pp and .LP callsuqs2010-10-081-1/+0
* 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-142-7/+22
* Make -U once again honor -D after my change to consolidate settingdougb2010-01-221-5/+5
* Use the newly brought %U macro.ru2010-01-151-1/+1
* 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-082-24/+30
* If we are using -p it does not make any sense to even create thedougb2009-12-311-2/+2
* It's not necessary to include both Op and Fl for command line optionsdougb2009-12-301-9/+11
* Document the DELETE_STALE_RC_FILES option introduced in r201291. This isdougb2009-12-301-16/+19
* 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-232-4/+4
* 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
OpenPOWER on IntegriCloud