@@ -22,26 +22,29 @@ The instructions below are for command line use of git.
22
22
23
23
24
24
1 . First, from the PR on the Github website, find the name of the
25
- fork + branch name. It should be formatted something like this:
25
+ user + branch name. It should be formatted something like this:
26
26
```
27
27
contributorusername:contributor_branch_name
28
28
```
29
29
30
+ Additionally, find the name of the fork on the fork's page on Github.
31
+ The `fork_name` may simply be `Submitty`, or the author may have chosen to another name.
32
+
30
33
31
34
2. Next, make a local branch on your computer in your working repository
32
- with the proposed code changes. Here are the command lines
33
- (substitute the fork & branch name we found above):
35
+ with the proposed code changes. Here are the command lines
36
+ (substitute the user, branch, and fork names we found above):
34
37
35
38
If you **are not** using ssh keys on git:
36
39
```
37
40
git checkout -b contributorusername-contributor_branch_name main
38
- git pull https://github.com/contributorusername/Submitty .git contributor_branch_name
41
+ git pull https://github.com/contributorusername/fork_name .git contributor_branch_name
39
42
```
40
43
41
44
If you **are** using ssh keys on git:
42
45
```
43
46
git checkout -b contributorusername-contributor_branch_name main
44
- git pull [email protected] :contributorusername/Submitty .git contributor_branch_name
47
+ git pull [email protected] :contributorusername/fork_name .git contributor_branch_name
45
48
```
46
49
47
50
@@ -58,13 +61,13 @@ The instructions below are for command line use of git.
58
61
59
62
If you **are not** using ssh keys on git:
60
63
```
61
- git remote add upstream https://github.com/contributorusername/Submitty .git
64
+ git remote add upstream https://github.com/contributorusername/fork_name .git
62
65
```
63
66
64
67
65
68
If you **are** using ssh keys on git:
66
69
```
67
- git remote add upstream [email protected] :contributorusername/Submitty .git
70
+ git remote add upstream [email protected] :contributorusername/fork_name .git
68
71
```
69
72
70
73
@@ -77,16 +80,16 @@ The instructions below are for command line use of git.
77
80
```
78
81
origin https://github.com/Submitty/Submitty.git (fetch)
79
82
origin https://github.com/Submitty/Submitty.git (push)
80
- upstream https://github.com/contributorusername/Submitty .git (fetch)
81
- upstream https://github.com/contributorusername/Submitty .git (push)
83
+ upstream https://github.com/contributorusername/fork_name .git (fetch)
84
+ upstream https://github.com/contributorusername/fork_name .git (push)
82
85
```
83
86
84
87
Or this if you **are** using ssh keys on git:
85
88
```
86
89
origin [email protected] :Submitty/Submitty.git (fetch)
87
90
origin [email protected] :Submitty/Submitty.git (push)
88
- upstream [email protected] :contributorusername/Submitty .git (fetch)
89
- upstream [email protected] :contributorusername/Submitty .git (push)
91
+ upstream [email protected] :contributorusername/fork_name .git (fetch)
92
+ upstream [email protected] :contributorusername/fork_name .git (push)
90
93
```
91
94
92
95
0 commit comments