summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
Commit message (Expand)AuthorAgeFilesLines
* Go back to taking the user's umask into account. Thanks to Alfred fordougb2002-06-101-23/+31
* * Use the new stat(1) to get mode information from the files wedougb2002-06-061-34/+33
* Actually accept the default argument to SCREEN_WIDTH.dougb2002-05-281-0/+3
* * Fix a small typo, thanks to olgenidougb2002-05-041-1/+4
* * Add some niceties to make the -p option quieter, and better behaveddougb2002-05-041-5/+28
* Solve the problem of spuriously comparing files that were createddougb2002-04-081-0/+3
* Document the two new options, pre buildworld mode anddougb2002-04-081-1/+12
* Improve grep'ing for variables in make.conf and rc.conf*.dougb2002-02-251-4/+4
* * Add a feature to do a "pre {build|install}world" check of (so far)dougb2002-02-241-26/+90
* * Update (c)dougb2002-02-121-2/+5
* * Update (c)dougb2002-02-121-1/+3
* Hopefully squish the problem of mm creating sendmail files indougb2001-08-071-1/+3
* Perform a major cleanup of the usr.sbin Makefiles.obrien2001-07-201-0/+1
* 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
* Work around the problem in RELENG_4 where the file doesn't actuallydougb2001-06-201-7/+13
* Add the last of the compatibility mods from openbsd. Neatly, thedougb2001-05-301-9/+14
* Various fixes, including suggestions from some thoughtful folks, thanks.dougb2001-05-281-18/+47
* Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrcdougb2001-05-281-1/+6
* Be more consistent with the terminology, referring to "temporary anddougb2001-05-281-2/+2
* Fix a problem when user selects -a (auto run) but we encounter a filedougb2001-05-281-1/+16
* Whitespace only changes to try and fit a little better into 80 columns.dougb2001-05-281-15/+20
* mdoc(7) police: normalize .Nd.ru2001-04-181-1/+1
* beforeinstall -> SCRIPTS.ru2001-04-071-4/+1
* Change NO_MAKEDEV to a finer granularity method:asmodai2001-03-291-1/+1
* - Backout botched attempt to introduce MANSECT feature.ru2001-03-261-1/+1
* * Add two requested features, source'ing of /etc/mergemaster.rc, anddougb2001-03-052-17/+66
* 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-092-4/+10
* Reorder one of the new features based on experience. Since the numberdougb2000-11-011-12/+12
* Add several new features, reorder some code, and continue with thedougb2000-10-302-97/+194
* Update copyrightdougb2000-10-291-1/+1
* More changes that don't modify functionality.dougb2000-10-291-60/+76
* Whitespace only. Make the style of the contributed sections consistent withdougb2000-10-291-133/+134
* Almost a year exactly from when I first imported mergemaster at freebsdcon,billf2000-10-261-2/+1
* Make mergemaster ignore files in /dev if /dev is a devfs.ben2000-08-261-1/+6
* Use new aliases path (/etc/mail/aliases)gshapiro2000-08-131-1/+1
* Be more careful about selecting a PAGER.brian2000-08-091-7/+14
* Update link to Making the World tutorial (now in the handbook)marko2000-08-071-2/+2
* Actually accept 'm' as a PAGER query response to mean 'more'.bsd2000-05-121-1/+1
* Make mergemaster only take single letters for options as well as loopalfred2000-04-021-114/+167
* Remove single-space hard sentence breaks. These degrade the qualitysheldonh2000-03-011-23/+46
* Use the new (Hi rwatson!) NO_MAKEDEV when making our temproot.billf2000-02-121-1/+1
* Allow $PAGER to have arguments.billf2000-02-081-1/+1
* ``mergemaster'' was repo-copied to ``mergemaster.sh'' as it's a shell script.chris1999-11-012-686/+1
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inbillf1999-10-263-0/+18
OpenPOWER on IntegriCloud