aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster/mergemaster.8
Commit message (Collapse)AuthorAgeFilesLines
* MFC 190320, don't expand example $FreeBSD stringsDoug Barton2009-03-231-3/+3
| | | | Notes: svn path=/stable/6/; revision=190322
* MFC r189761, r189763, r189992, r189994:Doug Barton2009-03-211-22/+42
| | | | | | | | | | 1. Fix creation and saving of the new mtree file with the -D option 2. Clean up usage() and man page so the options are all listed consistently 3. Add -F option 4. More man page cleanups for CVS -> VCS, punctuation, etc. Notes: svn path=/stable/6/; revision=190224
* MFC the changes from r179725, documentation of the AUTO_UPGRADE knob,Doug Barton2009-01-091-19/+42
| | | | | | | | | | | | | | | | | | | | | | | and 186677:186749: o Removal of 184781, 184804, and 184832 (automatic installation of files that differ only by VCS Id) o Fix cross-platform builds o Various improvements to the mtree (-U) feature o Remove the last of the MAKEDEV stuff o Switch to using the top level (e.g., /usr/src) Makefile, and specify that we should use the *.mk files from the source directory instead of the installed versions. o Check for the deprecated 'nodev' option in /etc/fstab o Add support for the IGNORE_FILES variable o Before installing a file check to make sure that the target does not already exist as a directory o Check to be sure that the file installed and error out if not o We only need to check for the presence of the target of $PAGER if that variable is actually set Notes: svn path=/stable/6/; revision=186938
* MFC auto updating of files not modified by the user.Gordon Tetlow2006-06-101-1/+3
| | | | Notes: svn path=/stable/6/; revision=159491
* Merge mergemaster.8:1.34, mergemaster.sh:1.53 from HEAD to RELENG_6:Robert Watson2006-02-131-1/+6
| | | | | | | | | | | | | | Add a -A argument to mergemaster to allow explicitly specifying an architecture to pass through to the underlying makefiles. This is quite useful when building on an i386 box to populate an amd64 NFS root. Head nod: dougb Approved by: re (scottl) Notes: svn path=/stable/6/; revision=155624
* MFC: a lot of manpage fixes from HEAD.Giorgos Keramidas2005-09-241-1/+1
| | | | | | | Approved by: re (hrs) Notes: svn path=/stable/6/; revision=150500
* Expand contractions.Ruslan Ermilov2005-02-131-1/+1
| | | | Notes: svn path=/head/; revision=141851
* Sort sections.Ruslan Ermilov2005-01-181-34/+34
| | | | Notes: svn path=/head/; revision=140442
* Added the EXIT STATUS section where appropriate.Ruslan Ermilov2005-01-171-1/+1
| | | | Notes: svn path=/head/; revision=140368
* Mechanically kill hard sentence breaks.Ruslan Ermilov2004-07-021-3/+7
| | | | Notes: svn path=/head/; revision=131500
* * Document the -P optionDoug Barton2003-05-021-1/+17
| | | | | | | | | * Add a paragraph suggesting that the merge option be used only for files that users have modified. People have been using this option for all files that are different, causing unecessary confusion. Notes: svn path=/head/; revision=114503
* Try another solution for not expanding a CVS tag.Doug Barton2003-02-271-1/+1
| | | | | | | Submitted by: roam Notes: svn path=/head/; revision=111604
* Try to fix two problems with the -I example. One is the fact that weDoug Barton2003-02-101-1/+1
| | | | | | | | | | want to match a character $, not EOL. The other is that CVS helpfully expanded my example into an actual CVS tag. Submitted by: gad Notes: svn path=/head/; revision=110633
* * Update copyright year.Doug Barton2003-02-051-2/+5
| | | | | | | * Add an example that ignores CVS Id tags for the new DIFF_OPTIONS variable. Notes: svn path=/head/; revision=110375
* Correct links to Handbook's pages, old URLs does not work anymore.Marc Fonvieille2002-07-301-1/+1
| | | | | | | MFC after: 1 week Notes: svn path=/head/; revision=100974
* The .Nm utilityPhilippe Charnier2002-07-141-6/+10
| | | | Notes: svn path=/head/; revision=99968
* * Fix a small typo, thanks to olgeniDoug Barton2002-05-041-1/+4
| | | | | | | * Document the COMP_CONFS variable in the .mergemasterrc example Notes: svn path=/head/; revision=96046
* Document the two new options, pre buildworld mode andDoug Barton2002-04-081-1/+12
| | | | | | | post-mm rc.conf[.local] comparisons. Notes: svn path=/head/; revision=94188
* * Update (c)Doug Barton2002-02-121-1/+3
| | | | | | | | * Expand on the definition of the -s (strict) option, at the suggestion of Gary W. Swearingen, swear@blarg.net. Notes: svn path=/head/; revision=90563
* mdoc(7) police: removed HISTORY info from the .Os call.Ruslan Ermilov2001-07-101-1/+1
| | | | Notes: svn path=/head/; revision=79537
* mdoc(7) police: remove extraneous .Pp before and/or after .Sh.Dima Dorfman2001-07-091-2/+0
| | | | Notes: svn path=/head/; revision=79454
* mdoc(7) police:Ruslan Ermilov2001-07-051-6/+7
| | | | | | | | | | | | | Use -tag list in the FILES section to work around the bug when .Pa font is not restored to its original value if one of the -hang, -ohang, or -inset lists is used in the FILES section. (The fix for the bug has just been submitted to the GNU Groff maintainers.) Also, fixed the Handbook reference in the SEE ALSO. Notes: svn path=/head/; revision=79300
* Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrcDoug Barton2001-05-281-1/+6
| | | | Notes: svn path=/head/; revision=77334
* mdoc(7) police: normalize .Nd.Ruslan Ermilov2001-04-181-1/+1
| | | | Notes: svn path=/head/; revision=75670
* * Add two requested features, source'ing of /etc/mergemaster.rc, andDoug Barton2001-03-051-2/+8
| | | | | | | | | | | | | | | | | asking the user to actually run the recommended commands related to installation of files such as aliases or login.conf. * Return to using grep for CVS $Id comparison. Using ident caused too many problems for people with local CVS/RCS tags in their stuff. Attempt to make portability a little easier to maintain in spite of this change by defining the name of the tag to search for. This is a slightly different change that solves the problem in the PR. PR: bin/24564 Submitted by: Tony Finch <dot@dotat.at> Notes: svn path=/head/; revision=73651
* Prepare for mdoc(7)NG.Ruslan Ermilov2000-12-271-4/+3
| | | | Notes: svn path=/head/; revision=70403
* mdoc(7) police: use the new features of the Nm macro.Ruslan Ermilov2000-11-201-1/+1
| | | | Notes: svn path=/head/; revision=68965
* mdoc(7) police: use certified section headers wherever possible.Ruslan Ermilov2000-11-171-1/+1
| | | | Notes: svn path=/head/; revision=68854
* Use Fx macro wherever possible.Ruslan Ermilov2000-11-141-1/+2
| | | | Notes: svn path=/head/; revision=68716
* * Reduce diffs to RELENG_4 by specifying a full path to sysctlDoug Barton2000-11-091-1/+1
| | | | | | | | | | | | | | | | | | * Adjust a little whitespace * Make the distrib-dirs/mtree on DESTDIR conditional on user actually specifying a DESTDIR. This seemed like a safe way to get the right directories and permissions in the installed tree since 'make installworld' does the same thing, but in practice too many people have custom hacks that we should leave unmolested. Still need to find a way to deal with 'install -d' and permissions on nonexistent directories in the middle of the path, but this is at least no worse that it was before. PR: bin/22661 Notes: svn path=/head/; revision=68507
* Add several new features, reorder some code, and continue with theDoug Barton2000-10-301-6/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | process of making the script more cross platform friendly. * Add -i option to automatically install files that do not exist on the system already. * Add the ability to specify DESTDIR. * Allow the user to specify scripts to run right before the comparison starts, and when mm is done. This will allow the user to specify customized local behavior, and implement features such as automatically deleting files. * Document the above changes in the man page. * Switch to using 'ident' for the CVS Id comparison, which should help with portability, and makes it faster. * Reorder, and in one case fix some code by doing things in ways that make more sense. * Check to see if the file exists on the system before doing the comparisons. This saves CPU cycles, and streamlines the auto-install process. I used bits and pieces of suggestions and patches from various people, ultimately too numerous to name. Which is not to say that they were not both appreciated, and helpful in achieving the ultimate result. Notes: svn path=/head/; revision=67949
* Update copyrightDoug Barton2000-10-291-1/+1
| | | | Notes: svn path=/head/; revision=67860
* Update link to Making the World tutorial (now in the handbook)Mark Ovens2000-08-071-2/+2
| | | | Notes: svn path=/head/; revision=64368
* Remove single-space hard sentence breaks. These degrade the qualitySheldon Hearn2000-03-011-23/+46
| | | | | | | | of the typeset output, tend to make diffs harder to read and provide bad examples for new-comers to mdoc. Notes: svn path=/head/; revision=57673
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inBill Fumerola1999-10-261-0/+2
| | | | | | | | | the FreeBSD default motd and the system motd Submitted by: author Notes: svn path=/head/; revision=52534
* freebsd -> FreeBSDBill Fumerola1999-10-261-1/+1
| | | | Notes: svn path=/head/; revision=52532
* Add $FreeBSD$Bill Fumerola1999-10-261-2/+1
| | | | | | | Submitted by: chris Notes: svn path=/head/; revision=52531
* Import mergemaster into the tree, a product of freebsdcon.Bill Fumerola1999-10-201-0/+278
Submitted by: Doug Barton <doug@gorean.org> Notes: svn path=/cvs2svn/branches/BARTON/; revision=52400
generated by cgit v1.3 (git 2.53.0) at 2026-05-14 04:43:12 +0000