Skip to content

Commit 1afe655

Browse files
committed
Rephrase intro and note to match different guide location, ABC-specific
1 parent a566491 commit 1afe655

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

docs/wiki-guide/Git-Cherry-Pick-Guide.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Git Cherry-pick update for Downstream Repos
22

3-
`git cherry-pick` is a handy tool to directly apply specific commits from one branch or repo to another even when they don't share a git history—especially when you do not want to merge large change sets. This can be helpful when forking another repo or building off an evolving template, such as this guide. Below, we provide a step-by-step guide to updating repositories based on the template guide repo:
3+
`git cherry-pick` is a handy tool to directly apply specific commits from one branch or repo to another even when they don't share a git history—especially when you do not want to merge large change sets. This can be helpful when forking another repo or building off an evolving template, such the [Collaborative Distributed Science Guide](https://github.com/Imageomics/Collaborative-distributed-science-guide). Below, we provide a step-by-step guide to updating repositories based on updating this repo from the template guide repo:
44

55
!!! tip "Be Prepared!"
66
Before you start, you should know which commits are going to be pulled from the template repo. Collect their hashes in a separate text file; be sure to list them in chronological order, so they can be applied correctly.
@@ -19,11 +19,11 @@
1919
```
2020

2121
!!! note
22-
If you haven't added this template repo as a remote yet, you will only see the current repo options (`origin`):
22+
If you haven't added the template repo as a remote yet, you will only see the current repo options (`origin`):
2323

2424
```console
25-
origin git@github.com:Imageomics/Imageomics-guide.git (fetch)
26-
origin git@github.com:Imageomics/Imageomics-guide.git (push)
25+
origin git@github.com:ABC-Center/ABC-guide.git (fetch)
26+
origin git@github.com:ABC-Center/ABC-guide.git (push)
2727
```
2828

2929
In which case, run the following to add the template guide as an available remote under the title `upstream`:
@@ -35,8 +35,8 @@
3535
After running `git remote -v`, you should then see
3636

3737
```console
38-
origin git@github.com:Imageomics/Imageomics-guide.git (fetch)
39-
origin git@github.com:Imageomics/Imageomics-guide.git (push)
38+
origin git@github.com:ABC-Center/ABC-guide.git (fetch)
39+
origin git@github.com:ABC-Center/ABC-guide.git (push)
4040
upstream git@github.com:Imageomics/Collaborative-distributed-science-guide.git (fetch)
4141
upstream git@github.com:Imageomics/Collaborative-distributed-science-guide.git (push)
4242
```

0 commit comments

Comments
 (0)