| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 1. Add a new option, --run-updates, to always or never run the newalises, | dougb | 2011-11-02 | 1 | -1/+10 |
| * | Make clear that the -U option can be dangerous. [1] | dougb | 2011-08-09 | 1 | -3/+6 |
| * | mdoc: drop redundant .Pp and .LP calls | uqs | 2010-10-08 | 1 | -1/+0 |
| * | Make it more clear in the docs that -a is not compatible with -iFU, | dougb | 2010-03-14 | 1 | -6/+9 |
| * | Use the newly brought %U macro. | ru | 2010-01-15 | 1 | -1/+1 |
| * | Update copyright date | dougb | 2010-01-08 | 1 | -2/+10 |
| * | It's not necessary to include both Op and Fl for command line options | dougb | 2009-12-30 | 1 | -9/+11 |
| * | Document the DELETE_STALE_RC_FILES option introduced in r201291. This is | dougb | 2009-12-30 | 1 | -16/+19 |
| * | Don't tempt svn to expand the example $FreeBSD strings | dougb | 2009-03-23 | 1 | -3/+3 |
| * | 1. Update for new -F option from r189992. | dougb | 2009-03-18 | 1 | -22/+42 |
| * | Add a note to the -m option indicating that you should now specify src/ | dougb | 2009-01-02 | 1 | -1/+9 |
| * | General Improvements | dougb | 2009-01-01 | 1 | -19/+31 |
| * | Document the AUTO_UPGRADE (-U) knob for .mergemasterrc | dougb | 2008-06-11 | 1 | -0/+3 |
| * | Add missed SYNOPSIS flag for auto upgrade. | gordon | 2006-04-30 | 1 | -1/+1 |
| * | Add auto upgrade capability to mergemaster. | gordon | 2006-04-29 | 1 | -0/+2 |
| * | Add a -A argument to mergemaster to allow explicitly specifying an | rwatson | 2006-02-04 | 1 | -1/+6 |
| * | Point to the right path under www.freebsd.org/doc for the Handbook | keramida | 2005-07-20 | 1 | -1/+1 |
| * | Expand contractions. | ru | 2005-02-13 | 1 | -1/+1 |
| * | Sort sections. | ru | 2005-01-18 | 1 | -34/+34 |
| * | Added the EXIT STATUS section where appropriate. | ru | 2005-01-17 | 1 | -1/+1 |
| * | Mechanically kill hard sentence breaks. | ru | 2004-07-02 | 1 | -3/+7 |
| * | * Document the -P option | dougb | 2003-05-02 | 1 | -1/+17 |
| * | Try another solution for not expanding a CVS tag. | dougb | 2003-02-27 | 1 | -1/+1 |
| * | Try to fix two problems with the -I example. One is the fact that we | dougb | 2003-02-10 | 1 | -1/+1 |
| * | * Update copyright year. | dougb | 2003-02-05 | 1 | -2/+5 |
| * | Correct links to Handbook's pages, old URLs does not work anymore. | blackend | 2002-07-30 | 1 | -1/+1 |
| * | The .Nm utility | charnier | 2002-07-14 | 1 | -6/+10 |
| * | * Fix a small typo, thanks to olgeni | dougb | 2002-05-04 | 1 | -1/+4 |
| * | Document the two new options, pre buildworld mode and | dougb | 2002-04-08 | 1 | -1/+12 |
| * | * Update (c) | dougb | 2002-02-12 | 1 | -1/+3 |
| * | mdoc(7) police: removed HISTORY info from the .Os call. | ru | 2001-07-10 | 1 | -1/+1 |
| * | mdoc(7) police: remove extraneous .Pp before and/or after .Sh. | dd | 2001-07-09 | 1 | -2/+0 |
| * | mdoc(7) police: | ru | 2001-07-05 | 1 | -6/+7 |
| * | Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrc | dougb | 2001-05-28 | 1 | -1/+6 |
| * | mdoc(7) police: normalize .Nd. | ru | 2001-04-18 | 1 | -1/+1 |
| * | * Add two requested features, source'ing of /etc/mergemaster.rc, and | dougb | 2001-03-05 | 1 | -2/+8 |
| * | Prepare for mdoc(7)NG. | ru | 2000-12-27 | 1 | -4/+3 |
| * | mdoc(7) police: use the new features of the Nm macro. | ru | 2000-11-20 | 1 | -1/+1 |
| * | mdoc(7) police: use certified section headers wherever possible. | ru | 2000-11-17 | 1 | -1/+1 |
| * | Use Fx macro wherever possible. | ru | 2000-11-14 | 1 | -1/+2 |
| * | * Reduce diffs to RELENG_4 by specifying a full path to sysctl | dougb | 2000-11-09 | 1 | -1/+1 |
| * | Add several new features, reorder some code, and continue with the | dougb | 2000-10-30 | 1 | -6/+58 |
| * | Update copyright | dougb | 2000-10-29 | 1 | -1/+1 |
| * | Update link to Making the World tutorial (now in the handbook) | marko | 2000-08-07 | 1 | -2/+2 |
| * | Remove single-space hard sentence breaks. These degrade the quality | sheldonh | 2000-03-01 | 1 | -23/+46 |
| * | Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences in | billf | 1999-10-26 | 1 | -0/+2 |
| * | freebsd -> FreeBSD | billf | 1999-10-26 | 1 | -1/+1 |
| * | Add $FreeBSD$ | billf | 1999-10-26 | 1 | -2/+1 |
| * | Import mergemaster into the tree, a product of freebsdcon. | billf | 1999-10-20 | 1 | -0/+278 |
