summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.8
Commit message (Expand)AuthorAgeFilesLines
* Remove request to email suggestions and fixes to the author.eadler2013-06-241-8/+0
* 1. Add a new option, --run-updates, to always or never run the newalises,dougb2011-11-021-1/+10
* Make clear that the -U option can be dangerous. [1]dougb2011-08-091-3/+6
* mdoc: drop redundant .Pp and .LP callsuqs2010-10-081-1/+0
* Make it more clear in the docs that -a is not compatible with -iFU,dougb2010-03-141-6/+9
* Use the newly brought %U macro.ru2010-01-151-1/+1
* Update copyright datedougb2010-01-081-2/+10
* 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
* Don't tempt svn to expand the example $FreeBSD stringsdougb2009-03-231-3/+3
* 1. Update for new -F option from r189992.dougb2009-03-181-22/+42
* Add a note to the -m option indicating that you should now specify src/dougb2009-01-021-1/+9
* General Improvementsdougb2009-01-011-19/+31
* Document the AUTO_UPGRADE (-U) knob for .mergemasterrcdougb2008-06-111-0/+3
* Add missed SYNOPSIS flag for auto upgrade.gordon2006-04-301-1/+1
* Add auto upgrade capability to mergemaster.gordon2006-04-291-0/+2
* Add a -A argument to mergemaster to allow explicitly specifying anrwatson2006-02-041-1/+6
* 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
* * Document the -P optiondougb2003-05-021-1/+17
* Try another solution for not expanding a CVS tag.dougb2003-02-271-1/+1
* Try to fix two problems with the -I example. One is the fact that wedougb2003-02-101-1/+1
* * Update copyright year.dougb2003-02-051-2/+5
* Correct links to Handbook's pages, old URLs does not work anymore.blackend2002-07-301-1/+1
* The .Nm utilitycharnier2002-07-141-6/+10
* * Fix a small typo, thanks to olgenidougb2002-05-041-1/+4
* Document the two new options, pre buildworld mode anddougb2002-04-081-1/+12
* * Update (c)dougb2002-02-121-1/+3
* mdoc(7) police: removed HISTORY info from the .Os call.ru2001-07-101-1/+1
* mdoc(7) police: remove extraneous .Pp before and/or after .Sh.dd2001-07-091-2/+0
* mdoc(7) police:ru2001-07-051-6/+7
* Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrcdougb2001-05-281-1/+6
* mdoc(7) police: normalize .Nd.ru2001-04-181-1/+1
* * Add two requested features, source'ing of /etc/mergemaster.rc, anddougb2001-03-051-2/+8
* Prepare for mdoc(7)NG.ru2000-12-271-4/+3
* mdoc(7) police: use the new features of the Nm macro.ru2000-11-201-1/+1
* mdoc(7) police: use certified section headers wherever possible.ru2000-11-171-1/+1
* Use Fx macro wherever possible.ru2000-11-141-1/+2
* * Reduce diffs to RELENG_4 by specifying a full path to sysctldougb2000-11-091-1/+1
* Add several new features, reorder some code, and continue with thedougb2000-10-301-6/+58
* Update copyrightdougb2000-10-291-1/+1
* Update link to Making the World tutorial (now in the handbook)marko2000-08-071-2/+2
* Remove single-space hard sentence breaks. These degrade the qualitysheldonh2000-03-011-23/+46
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inbillf1999-10-261-0/+2
* freebsd -> FreeBSDbillf1999-10-261-1/+1
* Add $FreeBSD$billf1999-10-261-2/+1
* Import mergemaster into the tree, a product of freebsdcon.billf1999-10-201-0/+278
OpenPOWER on IntegriCloud