From c02f76300fcf011ba84b162b97e6437953a13b7b Mon Sep 17 00:00:00 2001 From: Alexander Richardson Date: Tue, 5 Jan 2021 11:33:12 +0000 Subject: [PATCH] Fix remote name in "Migrating from GitHub fork" The new FreeBSD repository no longer contains the old master branch so we can't use freebsd/master in the rebase command. Update the instructions to use origin for the GitHub remote. --- src-cvt.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-cvt.md b/src-cvt.md index 3a530bb..b7255f8 100644 --- a/src-cvt.md +++ b/src-cvt.md @@ -218,7 +218,7 @@ historical branches... When migrating branches from a github fork from the old github mirror to the official repo, the process is straight forward. This assumes that -you have a `freebsd` upstream pointing to github, adjust if necessary. +you have a `origin` upstream pointing to github, adjust if necessary. This also assumes a clean tree before starting... 1. Add the new `freebsd` source of truth: ``` @@ -230,7 +230,7 @@ This also assumes a clean tree before starting... fetching the `freebsd` sources and creating a local `main` reference with the above checkout: ``` -% git rebase -i freebsd/master FOO --onto main +% git rebase -i origin/master FOO --onto main ``` And you'll now be tracking the official source of truth. You can then follow the `Keeping Current` section above to stay up to date.