aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
Commit message (Expand)AuthorAgeFilesLines
* Remove pointless check for the existence of /usr/bin/less which existsEitan Adler2012-12-051-13/+1
* Add ability to mergemaster to permit the user to typeEitan Adler2012-12-051-0/+5
* Remove references to CVS so that people will stop bringing it upDoug Barton2012-10-051-31/+37
* If using DISTDIR we need to be sure to create a ${DESTDIR}/var/db/zoneinfoDoug Barton2011-11-291-2/+2
* 1. Add a new option, --run-updates, to always or never run the newalises,Doug Barton2011-11-022-17/+63
* Make clear that the -U option can be dangerous. [1]Doug Barton2011-08-092-6/+10
* mdoc: drop redundant .Pp and .LP callsUlrich Spörlein2010-10-081-1/+0
* Hide the creation and population of the temprootDoug Barton2010-05-141-5/+5
* Add support run services_mkdb(8).Norikatsu Shigemura2010-05-041-0/+14
* Make it more clear in the docs that -a is not compatible with -iFU,Doug Barton2010-03-142-7/+22
* Make -U once again honor -D after my change to consolidate settingDoug Barton2010-01-221-5/+5
* Use the newly brought %U macro.Ruslan Ermilov2010-01-151-1/+1
* Oops, deleted one line too many. Add back the null case for IGNORE_MOTDDoug Barton2010-01-151-0/+1
* Now that we've officially arrived at FreeBSD 9, remove the IGNORE_MOTDDoug Barton2010-01-151-5/+2
* Update copyright dateDoug Barton2010-01-082-24/+30
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 12:01:13 +0000