Update 5.x-rc.md

doc/5.x-rc.md

@@ -22,59 +22,41 @@ See [Prerequisites](any-prereq.md)
 
 ```bash
 cd ~/src/master
-git checkout master
-git pull --ff-only origin master
+forkify pull -A --ff-only master origin/master
 ./tools/bin/scripts/set-version.php 5.X.beta1 --commit
 git push origin master
 ```
 
 ## 3: Make a branch
 
-For each git repo, we want to create a new branch for 5.X. This follows a naming convention:
+For each git repo, we want to create a new branch for 5.X.
+
+| repo | folder| original branch | new branch |
+|------|-------|-----------------|------------|
+|civicrm-core|./|master|5.X|
+|civicrm-packages|./packages/|master|5.X|
+|civicrm-backdrop|./backdrop/|1.x-master|1.x-5.X|
+|civicrm-drupal|./drupal/|6.x-master|6.x-5.X|
+|civicrm-drupal|./drupal/|7.x-master|7.x-5.X|
+|civicrm-drupal-8|./drupal-8/|master|5.X|
+|civicrm-joomla|./joomla/|master|5.X|
+|civicrm-wordpress|./WordPress/|master|5.X|
 
-| repo | original branch | new branch |
-|------|-----------------|------------|
-|civicrm-core|master|5.X|
-|civicrm-packages|master|5.X|
-|civicrm-backdrop|1.x-master|1.x-5.X|
-|civicrm-drupal|6.x-master|6.x-5.X|
-|civicrm-drupal|7.x-master|7.x-5.X|
-|civicrm-drupal-8|master|5.X|
-|civicrm-joomla|master|5.X|
-|civicrm-wordpress|master|5.X|
+If you don't already have the repos in the correct folders, then you can:
 
-The commands `git scan branch` and `git scan push` will do this – if you have a copy of each repo.
+* Create a suitable project (`civibuild create dist`) and look in `build/dist/src`, or...
+* Login to `latest.civicrm.org` and use `~/src/master`.
 
-A safe way to make a clean copy of every repo is to create a new `dist` build (`civibuild create dist`). On `latest.civicrm.org`, there's already a copy in `~/src/master`. Either way, you should make sure it's up-to-date on all relevant branches -- then make new branches:
+Either way, you should get the current code and create the branches:
 
 ```bash
-## Ensure that you have a clean, up-to-date copy of the `master` branch.
 cd ~/src/master
-git scan foreach -c 'pwd; git branch | grep \* ; echo'
-git scan up
- 
-## Fixme: for now you need to manually add the extra drupal branches
-( cd drupal && git checkout 6.x-master && git pull origin 6.x-master )
-( cd drupal && git checkout 7.x-master && git pull origin 7.x-master )
- 
-## Make branches (preview)
-git scan branch 5.X master -p -n -T
- 
-## Make branches (for real)
-git scan branch 5.X master -p
- 
-## Push the branches (preview)
-git scan push -up origin 5.X -n -T
- 
-## Push the branches (for real)
-git scan push -up origin 5.X
+forkify -A fetch origin
+forkify -A branch 5.X origin/master
+forkify -A push -u origin 5.X
 ```
 
-Finally, skim the published branches to make sure they match up:
-
-```
-civi-git-table --fetch master 5.X
-```
+> TIP: `forkify` can provide a preview (`--dry-run` aka `-N`) or an interactive confirmation (`--step` aka `-S`).
 
 ## 4: Setup automated processes