| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 1. Update for new -F option from r189992. | dougb | 2009-03-18 | 1 | -22/+42 |
| * | Add a new -F option to automatically install files that differ | dougb | 2009-03-18 | 1 | -2/+19 |
| * | 1. Clean up usage() output a bit by grouping options that take an argument | dougb | 2009-03-13 | 1 | -4/+5 |
| * | When using the -D option: | dougb | 2009-03-13 | 1 | -4/+4 |
| * | Instead of using obj and all targets which are not cross-build aware, | dougb | 2009-01-04 | 1 | -3/+4 |
| * | Add a note to the -m option indicating that you should now specify src/ | dougb | 2009-01-02 | 1 | -1/+9 |
| * | Simplify the code a little by moving the working part of | dougb | 2009-01-02 | 1 | -8/+12 |
| * | Only check for 'nodev' in fstab if that file exists | dougb | 2009-01-02 | 1 | -8/+10 |
| * | For IGNORE_FILES delete the version in the TEMPROOT, not the base. | dougb | 2009-01-02 | 1 | -1/+1 |
| * | General Improvements | dougb | 2009-01-01 | 1 | -19/+31 |
| * | Maintenance and updates | dougb | 2009-01-01 | 1 | -50/+85 |
| * | Revert 184781, 184804, and 184832 (automatic installation of files | dougb | 2009-01-01 | 1 | -19/+0 |
| * | No need to run rm ${COMPFILE} after mm_install() - mm_install() | sobomax | 2008-11-11 | 1 | -1/+0 |
| * | Improve on 184781 - instead of ignoring the file when the only difference | sobomax | 2008-11-09 | 1 | -2/+8 |
| * | Ignore files that only differ in CVS Id tag. | sobomax | 2008-11-09 | 1 | -0/+14 |
| * | Document the AUTO_UPGRADE (-U) knob for .mergemasterrc | dougb | 2008-06-11 | 1 | -0/+3 |
| * | Remove ISDN4BSD (I4B) from HEAD as it is not MPSAFE and | bz | 2008-05-26 | 1 | -2/+2 |
| * | In the following scenario: | dougb | 2007-12-21 | 1 | -0/+7 |
| * | Add missed SYNOPSIS flag for auto upgrade. | gordon | 2006-04-30 | 1 | -1/+1 |
| * | Add auto upgrade capability to mergemaster. | gordon | 2006-04-29 | 2 | -1/+88 |
| * | Add a -A argument to mergemaster to allow explicitly specifying an | rwatson | 2006-02-04 | 2 | -8/+17 |
| * | Change the default for deleting stale files from yes (which violates | dougb | 2005-12-21 | 1 | -5/+5 |
| * | 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 |
| * | In the case where /etc/rc.d/ is empty, do not bogusly ask the user if | dougb | 2004-03-07 | 1 | -1/+1 |
| * | Set MAKEOBJDIRPREFIX in the environment, like God intended. This | ru | 2004-03-06 | 1 | -3/+3 |
| * | mergemaster -p (pre-world) doesn't populate /etc/rc.d, which led to a | dougb | 2004-01-04 | 1 | -5/+4 |
| * | * Update copyright | dougb | 2004-01-01 | 1 | -2/+51 |
| * | Use the actual build target (all), since relying on the build as a | dougb | 2003-08-04 | 1 | -0/+1 |
| * | Remove MAINTAINER line in favor of the entry in src/MAINTAINERS | dougb | 2003-06-04 | 1 | -2/+0 |
| * | Preserve directory structure in PRESERVED_FILES_DIR to avoid | dougb | 2003-05-03 | 1 | -2/+2 |
| * | rc.sendmail should not have been removed yet. | dougb | 2003-05-02 | 1 | -2/+2 |
| * | * Document the -P option | dougb | 2003-05-02 | 1 | -1/+17 |
| * | * Add a -P (Preserve) option, which saves a copy of files that you replace. | dougb | 2003-05-02 | 1 | -20/+50 |
| * | style.Makefile(5) | obrien | 2003-04-04 | 1 | -2/+2 |
| * | Put back the deletion of TEMPROOT/etc/passwd. | dougb | 2003-03-05 | 1 | -1/+1 |
| * | Better handle the recent (desirable) change to create login.conf.db at | dougb | 2003-03-05 | 1 | -4/+4 |
| * | 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 | -5/+6 |
| * | * Update copyright year. | dougb | 2003-02-05 | 1 | -2/+5 |
| * | Backout last commit by request. | dillon | 2003-01-28 | 1 | -44/+11 |
| * | Commit simple mergemaster changes to make the UI more deterministic | dillon | 2003-01-25 | 1 | -11/+44 |
| * | Don't use NO_MAKEDEV* option, its the default now. | phk | 2002-10-22 | 1 | -1/+1 |
| * | Suppress spurious warning messages about rm -rf TEMPROOT failing | dougb | 2002-08-05 | 1 | -3/+3 |
| * | Fix a couple DESTDIR related problems. Credit for the "Only in" section | dougb | 2002-08-05 | 1 | -2/+2 |
| * | Correct links to Handbook's pages, old URLs does not work anymore. | blackend | 2002-07-30 | 1 | -1/+1 |
