| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Make mergemaster ignore files in /dev if /dev is a devfs. | ben | 2000-08-26 | 1 | -1/+6 |
| | | | | | Approved by: Doug Barton <Doug@gorean.org> | ||||
| * | Use new aliases path (/etc/mail/aliases) | gshapiro | 2000-08-13 | 1 | -1/+1 |
| | | | | | Approved by: Doug Barton <DougB@gorean.org> | ||||
| * | Be more careful about selecting a PAGER. | brian | 2000-08-09 | 1 | -7/+14 |
| | | | | | | | Improve the question asked when the PAGER is invalid. Submitted by: Doug Barton <DougB@gorean.org> | ||||
| * | Update link to Making the World tutorial (now in the handbook) | marko | 2000-08-07 | 1 | -2/+2 |
| | | |||||
| * | Actually accept 'm' as a PAGER query response to mean 'more'. | bsd | 2000-05-12 | 1 | -1/+1 |
| | | |||||
| * | Make mergemaster only take single letters for options as well as loop | alfred | 2000-04-02 | 1 | -114/+167 |
| | | | | | | | | | | | | | | | | | asking a question again if given an invalid input instead of assuming what the user wants. /etc is not the place to make assumptions when given invalid input. Reformat some of the more convoluted code into seperate functions instead of being inline using tabs instead of space indents. Allow the user to view merged files they created with sdiff. Allow the user to redisplay the diff between the installed file and the new file again. Time wasted waiting for review: 1 month 2 weeks | ||||
| * | Remove single-space hard sentence breaks. These degrade the quality | sheldonh | 2000-03-01 | 1 | -23/+46 |
| | | | | | | of the typeset output, tend to make diffs harder to read and provide bad examples for new-comers to mdoc. | ||||
| * | Use the new (Hi rwatson!) NO_MAKEDEV when making our temproot. | billf | 2000-02-12 | 1 | -1/+1 |
| | | | | | | Submitted by: Doug Barton <Doug@gorean.org> (maintainer) Approved by: you-know-who. | ||||
| * | Allow $PAGER to have arguments. | billf | 2000-02-08 | 1 | -1/+1 |
| | | | | | | | Submitted by: brian Reviewed by: Doug Barton <Doug@gorean.org> Approved by: jkh | ||||
| * | ``mergemaster'' was repo-copied to ``mergemaster.sh'' as it's a shell script. | chris | 1999-11-01 | 2 | -686/+1 |
| | | | | | | | | Delete the original mergemaster and modify Makefile to install mergemaster.sh. Seen no problem with by: billf No objections by: Doug Barton | ||||
| * | Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences in | billf | 1999-10-26 | 3 | -0/+18 |
| | | | | | | | the FreeBSD default motd and the system motd Submitted by: author | ||||
| * | Use $FreeBSD$ (instead of the author's $Revision$) to report the | billf | 1999-10-26 | 2 | -6/+2 |
| | | | | | | | version number now that we have it. Reviewed by: author | ||||
| * | freebsd -> FreeBSD | billf | 1999-10-26 | 1 | -1/+1 |
| | | |||||
| * | Add $FreeBSD$ | billf | 1999-10-26 | 1 | -2/+1 |
| | | | | | Submitted by: chris | ||||
| * | Co-MAINTAINER this module. | billf | 1999-10-26 | 1 | -0/+1 |
| | | |||||
| * | Add $FreeBSD$ | billf | 1999-10-25 | 2 | -0/+2 |
| | | |||||
| * | mergemaster bmake glue. | billf | 1999-10-20 | 1 | -0/+11 |
| | | |||||
| * | Import mergemaster into the tree, a product of freebsdcon. | billf | 1999-10-20 | 3 | -0/+1634 |
| Submitted by: Doug Barton <doug@gorean.org> | |||||
 |
index : FreeBSD-src | |
| Raptor Engineering's fork of pfsense FreeBSD src with pfSense changes | Raptor Engineering, LLC |
| summaryrefslogtreecommitdiffstats |
|