Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix remote name in "Migrating from GitHub fork" #73

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix remote name in "Migrating from GitHub fork" #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src-cvt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
```
Expand All @@ -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.
Expand Down