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
/
mergemaster.sh
Commit message (
Expand
)
Author
Age
Files
Lines
*
Work around the problem in RELENG_4 where the file doesn't actually
dougb
2001-06-20
1
-7
/
+13
*
Add the last of the compatibility mods from openbsd. Neatly, the
dougb
2001-05-30
1
-9
/
+14
*
Various fixes, including suggestions from some thoughtful folks, thanks.
dougb
2001-05-28
1
-18
/
+47
*
Be more consistent with the terminology, referring to "temporary and
dougb
2001-05-28
1
-2
/
+2
*
Fix a problem when user selects -a (auto run) but we encounter a file
dougb
2001-05-28
1
-1
/
+16
*
Whitespace only changes to try and fit a little better into 80 columns.
dougb
2001-05-28
1
-15
/
+20
*
Change NO_MAKEDEV to a finer granularity method:
asmodai
2001-03-29
1
-1
/
+1
*
* Add two requested features, source'ing of /etc/mergemaster.rc, and
dougb
2001-03-05
1
-15
/
+58
*
* Reduce diffs to RELENG_4 by specifying a full path to sysctl
dougb
2000-11-09
1
-3
/
+9
*
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
1
-91
/
+136
*
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
*
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
*
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
*
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
*
Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences in
billf
1999-10-26
1
-0
/
+8
*
Use $FreeBSD$ (instead of the author's $Revision$) to report the
billf
1999-10-26
1
-3
/
+1
*
Add $FreeBSD$
billf
1999-10-25
1
-0
/
+1
*
Import mergemaster into the tree, a product of freebsdcon.
billf
1999-10-20
1
-0
/
+678