summaryrefslogtreecommitdiffstats
path: root/UPDATING
diff options
context:
space:
mode:
authorjmg <jmg@FreeBSD.org>2014-02-28 19:51:47 +0000
committerjmg <jmg@FreeBSD.org>2014-02-28 19:51:47 +0000
commit7722bd75887716d0723b63bbcbae29b1eef09e72 (patch)
tree370908b2abc446fc0fd820c36b2e8c05c5c509ec /UPDATING
parentb01fe2fbf6a63c431d1f42e919d40adf76f22991 (diff)
downloadFreeBSD-src-7722bd75887716d0723b63bbcbae29b1eef09e72.zip
FreeBSD-src-7722bd75887716d0723b63bbcbae29b1eef09e72.tar.gz
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...
Diffstat (limited to 'UPDATING')
-rw-r--r--UPDATING8
1 files changed, 4 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 3d01ba6..16fc1b1 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>
OpenPOWER on IntegriCloud