jprdonnelly/docs
1
0
Fork 0
mirror of synced 2026-01-07 09:01:31 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into dependabot-graph-actions

Browse Source
This commit is contained in:
Sarita Iyer
2022-01-31 13:13:24 -05:00
committed by GitHub
parent c7ba60a7db 01e701fb95
commit 5df847ec80
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
content/get-started/using-git/about-git-subtree-merges.md
View File

@@ -52,7 +52,7 @@ 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.
@@ -60,7 +60,7 @@ The best way to explain subtree merges is to show by example. We will:
> 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.