index
:
FreeBSD-src
RELENG_2_2
RELENG_2_3
RELENG_2_3_0
RELENG_2_3_1
RELENG_2_3_2
RELENG_2_3_3
RELENG_2_3_4
RELENG_2_4
RELENG_2_4_4
RELENG_2_4_OLD
devel
devel-11
releng/10.1
releng/10.3
releng/11.0
releng/11.1
stable/10
stable/11
Raptor Engineering's fork of pfsense FreeBSD src with pfSense changes
Raptor Engineering, LLC
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
usr.sbin
/
mergemaster
Commit message (
Expand
)
Author
Age
Files
Lines
*
beforeinstall -> SCRIPTS.
ru
2001-04-07
1
-4
/
+1
*
Change NO_MAKEDEV to a finer granularity method:
asmodai
2001-03-29
1
-1
/
+1
*
- Backout botched attempt to introduce MANSECT feature.
ru
2001-03-26
1
-1
/
+1
*
* Add two requested features, source'ing of /etc/mergemaster.rc, and
dougb
2001-03-05
2
-17
/
+66
*
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
2
-4
/
+10
*
Reorder one of the new features based on experience. Since the number
dougb
2000-11-01
1
-12
/
+12
*
Add several new features, reorder some code, and continue with the
dougb
2000-10-30
2
-97
/
+194
*
Update copyright
dougb
2000-10-29
1
-1
/
+1
*
More changes that don't modify functionality.
dougb
2000-10-29
1
-60
/
+76
*
Whitespace only. Make the style of the contributed sections consistent with
dougb
2000-10-29
1
-133
/
+134
*
Almost a year exactly from when I first imported mergemaster at freebsdcon,
billf
2000-10-26
1
-2
/
+1
*
Make mergemaster ignore files in /dev if /dev is a devfs.
ben
2000-08-26
1
-1
/
+6
*
Use new aliases path (/etc/mail/aliases)
gshapiro
2000-08-13
1
-1
/
+1
*
Be more careful about selecting a PAGER.
brian
2000-08-09
1
-7
/
+14
*
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
*
Remove single-space hard sentence breaks. These degrade the quality
sheldonh
2000-03-01
1
-23
/
+46
*
Use the new (Hi rwatson!) NO_MAKEDEV when making our temproot.
billf
2000-02-12
1
-1
/
+1
*
Allow $PAGER to have arguments.
billf
2000-02-08
1
-1
/
+1
*
``mergemaster'' was repo-copied to ``mergemaster.sh'' as it's a shell script.
chris
1999-11-01
2
-686
/
+1
*
Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences in
billf
1999-10-26
3
-0
/
+18
*
Use $FreeBSD$ (instead of the author's $Revision$) to report the
billf
1999-10-26
2
-6
/
+2
*
freebsd -> FreeBSD
billf
1999-10-26
1
-1
/
+1
*
Add $FreeBSD$
billf
1999-10-26
1
-2
/
+1
*
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