aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
Commit message (Expand)AuthorAgeFilesLines
* Update several more URLsEitan Adler2017-10-291-1/+1
* mergemaster: fix description of -pEnji Cooper2017-03-071-4/+5
* META_MODE: Don't require filemon(4) for mergemaster(8)/etcupdate(8)Bryan Drewery2016-07-121-1/+1
* All supported releases have the -m support from r186678, so removeBryan Drewery2015-09-291-7/+6
* Add META_MODE support.Simon J. Gerraty2015-06-131-0/+11
|\
| * dirdeps.mk now sets DEP_RELDIRSimon J. Gerraty2015-06-081-2/+0
| * Merge head from 7/28Simon J. Gerraty2014-08-192-3/+3
| |\ | |/ |/|
| * Merge headSimon J. Gerraty2014-04-281-3/+10
| |\
| * \ Merge headSimon J. Gerraty2013-09-111-1/+1
| |\ \
| * \ \ Merge from headSimon J. Gerraty2013-09-052-13/+5
| |\ \ \
| * | | | Updated dependenciesSimon J. Gerraty2013-02-161-2/+0
| * | | | Sync with HEAD.David E. O'Brien2013-02-081-13/+6
| |\ \ \ \
| * \ \ \ \ Sync from headSimon J. Gerraty2012-11-041-31/+37
| |\ \ \ \ \
| * | | | | | Sync FreeBSD's bmake branch with Juniper's internal bmake branch.Marcel Moolenaar2012-08-221-0/+14
* | | | | | | Remove ia64.Marcel Moolenaar2014-07-071-2/+2
* | | | | | | use .Mt to mark up email addresses consistently (part2)Baptiste Daroussin2014-06-201-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | mergemaster: Avoid "/var/tmp/temproot disappeared" if there is nothing toJilles Tjoelker2014-04-141-1/+1
* | | | | | Generate /var/db/services.db during 'make distribution' so that it isJohn Baldwin2014-01-221-1/+2
* | | | | | Fix mergemaster -U by forcing FreeBSD 9 compatiblity in mtree when mtree isBrooks Davis2013-11-221-1/+7
| |_|_|_|/ |/| | | |
* | | | | Pass -n (do not emit comments) when saving mtree information for futureXin LI2013-09-091-1/+1
| |_|_|/ |/| | |
* | | | Remove request to email suggestions and fixes to the author.Eitan Adler2013-06-241-8/+0
* | | | Don't mess with /etc/localtime if it is a symlink.Peter Wemm2013-05-221-1/+1
* | | | Permit relative paths with mergemaster -mEitan Adler2013-05-101-0/+1
* | | | Use the system MAKEOBJDIRPREFIX when running make targets inBrooks Davis2013-04-251-4/+3
| |_|/ |/| |
* | | 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