aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster/mergemaster.8
Commit message (Expand)AuthorAgeFilesLines
* * 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
* Update link to Making the World tutorial (now in the handbook)Mark Ovens2000-08-071-2/+2
* Remove single-space hard sentence breaks. These degrade the qualitySheldon Hearn2000-03-011-23/+46
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inBill Fumerola1999-10-261-0/+2
* freebsd -> FreeBSDBill Fumerola1999-10-261-1/+1
* Add $FreeBSD$Bill Fumerola1999-10-261-2/+1
* Import mergemaster into the tree, a product of freebsdcon.Bill Fumerola1999-10-201-0/+278
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 11:47:21 +0000