summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge/sysmerge.8
AgeCommit message (Expand)Author
2012-08-28Always compare master.passwd(5) and group(5) regardless of their sums:Antoine Jacoutot
2012-08-15use Lk for links;Jason McIntyre
2012-02-17Remove the backup chunk from the man page. People should use backupAntoine Jacoutot
2011-07-21Adjust work directory name.Antoine Jacoutot
2010-11-11Missed that part in previous.Antoine Jacoutot
2010-11-11Unconfuse usage.Antoine Jacoutot
2010-07-05Automatically install missing users and groups.Antoine Jacoutot
2010-03-20s/sh/ksh/Antoine Jacoutot
2009-12-18Add etcsum and xetcsum to IGNORE_FILES. Needed for upcoming change.Antoine Jacoutot
2009-12-06Add /var/db/locate.database and /var/games/tetris.scores to IGNORE_FILES.Antoine Jacoutot
2009-08-23Document all variables used by sysmerge.Antoine Jacoutot
2009-08-18HEADS-UP: change the way sysmerge(8) runs by default.Antoine Jacoutot
2009-06-05tweak previous;Jason McIntyre
2009-06-04When in auto-mode, automatically install binary files (from the X set).Antoine Jacoutot
2009-05-12simplify the descriptions of -a and -b; this has taken me and antoineJason McIntyre
2009-05-12- tweak the description of -aJason McIntyre
2009-05-11This commit adds a new feature to sysmerge(8), usable in '-a' mode.Antoine Jacoutot
2009-04-12When in automode, sysmerge will now automatically install filesAntoine Jacoutot
2009-04-09Sort.Antoine Jacoutot
2009-04-09Add a hook to deal with special sendmail db files under /etc/mail/Antoine Jacoutot
2009-04-06new sentence, new line;Jason McIntyre
2009-04-06Add a report summary file, ${WRKDIR}/sysmerge.log, that will include allAntoine Jacoutot
2009-03-25Several cleanups:Antoine Jacoutot
2009-03-25You can now feed sysmerge with an etcXX and/or xetcXX tarball(s)Antoine Jacoutot
2009-02-17- always run pwd_mdb, newaliases, MAKEDEV and cap_mkdb even when not inAntoine Jacoutot
2008-12-17more on editors; ok ajacoutotJason McIntyre
2008-12-16- make it possible to edit a merged file using an external editor ;Antoine Jacoutot
2008-09-12- make it possible to use a user defined MERGE_CMD instead of sdiffAntoine Jacoutot
2008-07-04Teach sysmerge to retrieve {etc,xetc}*.tgz files from FTP/HTTPStuart Henderson
2008-07-04some small text improvements; ok ajacoutotJason McIntyre
2008-06-13- add support for ignoring files and directories from comparisonAntoine Jacoutot
2008-06-13- always force full file check on fbtab, login.conf, sysctl.conf andAntoine Jacoutot
2008-06-09- encourage people to use the same source as was used to upgrade systemAntoine Jacoutot
2008-06-01- make it possible to merge files from xetcXX onlyAntoine Jacoutot
2008-05-14- add a non-interactive mode to sysmerge ('-b')Antoine Jacoutot
2008-04-30* add xetcXX.tgz support to sysmerge and handle binary filesAntoine Jacoutot
2008-04-24kill first personTheo de Raadt
2008-04-22Welcome sysmerge(8), a mergemaster-based utility to help you updateAntoine Jacoutot