aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster/mergemaster.8
Commit message (Expand)AuthorAgeFilesLines
* Cross-reference mergemaster(8) & etcupdate(8).Mateusz Piotrowski2018-11-271-1/+2
* Switch the default pager for most commands to lessAlan Somers2018-08-081-3/+3
* Update several more URLsEitan Adler2017-10-291-1/+1
* mergemaster: fix description of -pEnji Cooper2017-03-071-4/+5
* All supported releases have the -m support from r186678, so removeBryan Drewery2015-09-291-7/+6
* use .Mt to mark up email addresses consistently (part2)Baptiste Daroussin2014-06-201-1/+1
* Remove request to email suggestions and fixes to the author.Eitan Adler2013-06-241-8/+0
* 1. Add a new option, --run-updates, to always or never run the newalises,Doug Barton2011-11-021-1/+10
* Make clear that the -U option can be dangerous. [1]Doug Barton2011-08-091-3/+6
* mdoc: drop redundant .Pp and .LP callsUlrich Spörlein2010-10-081-1/+0
* Make it more clear in the docs that -a is not compatible with -iFU,Doug Barton2010-03-141-6/+9
* Use the newly brought %U macro.Ruslan Ermilov2010-01-151-1/+1
* Update copyright dateDoug Barton2010-01-081-2/+10
* 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
* Don't tempt svn to expand the example $FreeBSD stringsDoug Barton2009-03-231-3/+3
* 1. Update for new -F option from r189992.Doug Barton2009-03-181-22/+42
* Add a note to the -m option indicating that you should now specify src/Doug Barton2009-01-021-1/+9
* General ImprovementsDoug Barton2009-01-011-19/+31
* Document the AUTO_UPGRADE (-U) knob for .mergemasterrcDoug Barton2008-06-111-0/+3
* Add missed SYNOPSIS flag for auto upgrade.Gordon Tetlow2006-04-301-1/+1
* Add auto upgrade capability to mergemaster.Gordon Tetlow2006-04-291-0/+2
* Add a -A argument to mergemaster to allow explicitly specifying anRobert Watson2006-02-041-1/+6
* 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
* * Document the -P optionDoug Barton2003-05-021-1/+17
* Try another solution for not expanding a CVS tag.Doug Barton2003-02-271-1/+1
* Try to fix two problems with the -I example. One is the fact that weDoug Barton2003-02-101-1/+1
* * Update copyright year.Doug Barton2003-02-051-2/+5
* Correct links to Handbook's pages, old URLs does not work anymore.Marc Fonvieille2002-07-301-1/+1
* The .Nm utilityPhilippe Charnier2002-07-141-6/+10
* * Fix a small typo, thanks to olgeniDoug Barton2002-05-041-1/+4
* Document the two new options, pre buildworld mode andDoug Barton2002-04-081-1/+12
* * Update (c)Doug Barton2002-02-121-1/+3
* mdoc(7) police: removed HISTORY info from the .Os call.Ruslan Ermilov2001-07-101-1/+1
* mdoc(7) police: remove extraneous .Pp before and/or after .Sh.Dima Dorfman2001-07-091-2/+0
* mdoc(7) police:Ruslan Ermilov2001-07-051-6/+7
* Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrcDoug Barton2001-05-281-1/+6
* mdoc(7) police: normalize .Nd.Ruslan Ermilov2001-04-181-1/+1
* * Add two requested features, source'ing of /etc/mergemaster.rc, andDoug Barton2001-03-051-2/+8
* Prepare for mdoc(7)NG.Ruslan Ermilov2000-12-271-4/+3
* mdoc(7) police: use the new features of the Nm macro.Ruslan Ermilov2000-11-201-1/+1
* mdoc(7) police: use certified section headers wherever possible.Ruslan Ermilov2000-11-171-1/+1
* Use Fx macro wherever possible.Ruslan Ermilov2000-11-141-1/+2
* * Reduce diffs to RELENG_4 by specifying a full path to sysctlDoug Barton2000-11-091-1/+1
* Add several new features, reorder some code, and continue with theDoug Barton2000-10-301-6/+58
* Update copyrightDoug Barton2000-10-291-1/+1