diff options
| author | John-Mark Gurney <jmg@FreeBSD.org> | 2014-02-28 19:51:47 +0000 |
|---|---|---|
| committer | John-Mark Gurney <jmg@FreeBSD.org> | 2014-02-28 19:51:47 +0000 |
| commit | 059400366e7d0ef65fca54397a69daecb7190967 (patch) | |
| tree | 370908b2abc446fc0fd820c36b2e8c05c5c509ec /UPDATING | |
| parent | 4570e665b479c7ccd083c311d32c203bc1d9eed3 (diff) | |
| download | src-test-059400366e7d0ef65fca54397a69daecb7190967.tar.gz src-test-059400366e7d0ef65fca54397a69daecb7190967.zip | |
since -F is safe, and an update from 10-HEAD to 10-STABLE is sooo bloody
anoying w/o it.. recommend people use -F too...
Notes
Notes:
svn path=/head/; revision=262619
Diffstat (limited to 'UPDATING')
| -rw-r--r-- | UPDATING | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING index 3d01ba60370a4..16fc1b17f5207 100644 --- a/UPDATING +++ b/UPDATING @@ -1953,9 +1953,9 @@ COMMON ITEMS: make kernel KERNCONF=YOUR_KERNEL_HERE [1] <reboot in single user> [3] - mergemaster -p [5] + mergemaster -Fp [5] make installworld - mergemaster -i [4] + mergemaster -Fi [4] make delete-old [6] <reboot> @@ -1990,9 +1990,9 @@ COMMON ITEMS: make kernel KERNCONF=YOUR_KERNEL_HERE [8] [1] <reboot in single user> [3] - mergemaster -p [5] + mergemaster -Fp [5] make installworld - mergemaster -i [4] + mergemaster -Fi [4] make delete-old [6] <reboot> |