summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge
AgeCommit message (Expand)Author
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-12-15Cleanup the temporary directory in all the error paths.Federico G. Schwindt
2008-09-17- when merging a file, add a key to see a diff between the merged fileAntoine Jacoutot
2008-09-12- make it possible to use a user defined MERGE_CMD instead of sdiffAntoine Jacoutot
2008-09-12- use shell built-in getopts instead of getopt(1)Antoine Jacoutot
2008-09-06- don't list *.merged files in the "remaining for you to merge by hand"Antoine Jacoutot
2008-09-02- make sure they are no sendmail leftovers in src when sysmerge stopsAntoine Jacoutot
2008-08-29- prevent sysmerge from installing a virgin master.passwd and groupAntoine Jacoutot
2008-07-21Leave PATH alone.Antoine Jacoutot
2008-07-10Fix "etc source" output when not using a tarballAntoine Jacoutot
2008-07-08Typo in summarize output.Antoine 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- don't ask for yesno confirmation when running in automatic modeAntoine Jacoutot
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-10Additionnal checks on the file names supplied for -s and -x.Pierre-Yves Ritschard
2008-06-09- add a sanity check on tarballs name to ensure we're not feedingAntoine Jacoutot
2008-06-09- encourage people to use the same source as was used to upgrade systemAntoine Jacoutot
2008-06-08- remove sendmail cf files leftover after make in srcAntoine Jacoutot
2008-06-08- enhance output for 80 columns wide terminalsAntoine Jacoutot
2008-06-01- make it possible to merge files from xetcXX onlyAntoine Jacoutot
2008-05-14- fix new directory creation by using the correct variable;Antoine 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-23- clarify copyright / licenseAntoine Jacoutot
2008-04-23usage is only used once; ok millertTheo de Raadt
2008-04-23Re-indent codeTodd C. Miller
2008-04-22Welcome sysmerge(8), a mergemaster-based utility to help you updateAntoine Jacoutot
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 20:30:12 +0000