Skip to content

Switch from git to http remote URL in about-git-subtree-merges.md #13101

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

Merged
merged 3 commits into from
Jan 31, 2022
Merged

Switch from git to http remote URL in about-git-subtree-merges.md #13101

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adc68a3
Switch from git to http remote URL in about-git-subtree-merges.md
matta Dec 17, 2021
cd4ecee
Merge branch 'main' into patch-2
lecoursen Jan 27, 2022
e506789
Merge branch 'main' into patch-2
docubot Jan 31, 2022
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 content/get-started/using-git/about-git-subtree-merges.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ The best way to explain subtree merges is to show by example. We will:

1. Add a new remote URL pointing to the separate project that we're interested in.
```shell
$ git remote add -f spoon-knife git@github.com:octocat/Spoon-Knife.git
$ git remote add -f spoon-knife https://github.com/octocat/Spoon-Knife.git
> Updating spoon-knife
> warning: no common commits
> remote: Counting objects: 1732, done.
> remote: Compressing objects: 100% (750/750), done.
> remote: Total 1732 (delta 1086), reused 1558 (delta 967)
> Receiving objects: 100% (1732/1732), 528.19 KiB | 621 KiB/s, done.
> Resolving deltas: 100% (1086/1086), done.
> From git://github.com/octocat/Spoon-Knife
> From https://github.com/octocat/Spoon-Knife
> * [new branch] main -> Spoon-Knife/main
```
2. Merge the `Spoon-Knife` project into the local Git project. This doesn't change any of your files locally, but it does prepare Git for the next step.
Expand Down