Skip to content

Commit 09ee493

Browse files
committed
🎨 uniforms mentions to text editor, updates links, moves additional repositories
1 parent 218fd35 commit 09ee493

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎ch00git/02Solo.ipynb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
"outputs": [],
234234
"source": [
235235
"%%bash\n",
236-
"git config --global core.editor vim "
236+
"git config --global core.editor nano"
237237
]
238238
},
239239
{
@@ -276,7 +276,7 @@
276276
"cell_type": "markdown",
277277
"metadata": {},
278278
"source": [
279-
"To configure Notepad++ on windows you'll need something like the below, ask a demonstrator to help for your machine."
279+
"To configure VS Code on your operating system you'll need something like the below, ask a demonstrator to help for your machine."
280280
]
281281
},
282282
{
@@ -299,7 +299,7 @@
299299
"cell_type": "markdown",
300300
"metadata": {},
301301
"source": [
302-
"I'm going to be using `vim` as my editor, but you can use whatever editor you prefer. Find how to setup your favourite editor in [the setup chapter of Software Carpentry's Git lesson](http://swcarpentry.github.io/git-novice/02-setup/index.html)."
302+
"I'm going to be using `nano` as my editor, but you can use whatever editor you prefer. Find how to setup your favourite editor in [the setup chapter of Software Carpentry's Git lesson](https://swcarpentry.github.io/git-novice/02-setup.html)."
303303
]
304304
},
305305
{
@@ -407,7 +407,7 @@
407407
"source": [
408408
"Let's edit the file again:\n",
409409
"\n",
410-
" vim index.md"
410+
" nano index.md"
411411
]
412412
},
413413
{
@@ -891,7 +891,7 @@
891891
"metadata": {},
892892
"source": [
893893
"```bash\n",
894-
"vim index.md\n",
894+
"nano index.md\n",
895895
"```"
896896
]
897897
},
@@ -1112,7 +1112,7 @@
11121112
"participant \"Cleese's index\" as I\n",
11131113
"participant Cleese as C\n",
11141114
"\n",
1115-
"note right of C: vim index.md\n",
1115+
"note right of C: nano index.md\n",
11161116
"\n",
11171117
"note right of C: git init\n",
11181118
"C->R: create\n",
@@ -1124,14 +1124,14 @@
11241124
"note right of C: git commit\n",
11251125
"I->R: Commit content of index.md\n",
11261126
"\n",
1127-
"note right of C: vim index.md\n",
1127+
"note right of C: nano index.md\n",
11281128
"\n",
11291129
"note right of C: git add --update\n",
11301130
"C->I: Add content of index.md\n",
11311131
"note right of C: git commit -m \"Add a lie\"\n",
11321132
"I->R: Commit change to index.md\n",
11331133
"\n",
1134-
"note right of C: vim index.md\n",
1134+
"note right of C: nano index.md\n",
11351135
"note right of C: git commit -am \"Change title\"\n",
11361136
"C->R: Add and commit change to index.md (and all tracked files)\n",
11371137
"\"\"\"\n",

‎ch00git/04Publishing.ipynb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"\n",
8484
"Students can get free private repositories on GitHub, by going to [GitHub Education](https://education.github.com/) and filling in a form (look for the Student Developer Pack). \n",
8585
"\n",
86-
"UCL pays for private GitHub repositories for UCL research groups: you can find the service details on the [Research Software Development Group's website](https://www.ucl.ac.uk/isd/services/research-it/research-software-development-tools/support-for-ucl-researchers-to-use-github)."
86+
"UCL pays for private GitHub repositories for UCL research groups: you can find the service details on the [Advanced Research Computing Centre's website](https://www.ucl.ac.uk/advanced-research-computing/expertise/research-software-development/research-software-development-tools/support-ucl-2)."
8787
]
8888
},
8989
{
@@ -144,7 +144,7 @@
144144
],
145145
"source": [
146146
"%%bash\n",
147-
"git push -uf origin main # I have an extra `f` switch here.\n",
147+
"git push -uf origin main # You shouldn't need the extra `f` switch. We use it here to force the push and rewrite that repository.\n",
148148
" #You should copy the instructions from YOUR repository."
149149
]
150150
},
@@ -239,7 +239,7 @@
239239
"metadata": {},
240240
"source": [
241241
"``` bash\n",
242-
"vim lakeland.md\n",
242+
"nano lakeland.md\n",
243243
"```"
244244
]
245245
},
@@ -681,8 +681,8 @@
681681
"participant \"Cleese's index\" as I\n",
682682
"participant Cleese as C\n",
683683
"\n",
684-
"note right of C: vim index.md\n",
685-
"note right of C: vim lakeland.md\n",
684+
"note right of C: nano index.md\n",
685+
"note right of C: nano lakeland.md\n",
686686
"\n",
687687
"note right of C: git add index.md\n",
688688
"C->I: Add *only* the changes to index.md to the staging area\n",

‎ch00git/11Miscellany.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@
818818
"### UCL layout for GitHub pages\n",
819819
"\n",
820820
"You can use GitHub pages to make HTML layouts, here's an [example of how to do it](http://github.com/UCL/ucl-github-pages-example), \n",
821-
"and [how it looks](http://ucl.github.com/ucl-github-pages-example). We won't go into the detail of this now, \n",
821+
"and [how it looks](http://github-pages.ucl.ac.uk/ucl-github-pages-example). We won't go into the detail of this now,\n",
822822
"but after the class, you might want to try this."
823823
]
824824
}

‎ch00git/12Remotes.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"source": [
9999
"%%bash\n",
100100
"git switch main\n",
101-
"git remote add rits [email protected]:ucl-rits/github-example.git\n",
101+
"git remote add arc [email protected]:UCL-ARC-RSEing-with-Python/github-example.git\n",
102102
"git remote -v"
103103
]
104104
},
@@ -189,7 +189,7 @@
189189
],
190190
"source": [
191191
"%%bash\n",
192-
"git push -uf rits main"
192+
"git push -uf arc main"
193193
]
194194
},
195195
{
@@ -231,7 +231,7 @@
231231
"source": [
232232
"%%bash\n",
233233
"git fetch\n",
234-
"git log --oneline --left-right rits/main...origin/main"
234+
"git log --oneline --left-right arc/main...origin/main"
235235
]
236236
},
237237
{
@@ -493,7 +493,7 @@
493493
"copying the content from your computer. (Probably at .ssh/id_rsa.pub)\n",
494494
"\n",
495495
"If you have difficulties, the instructions for this are [on the GitHub\n",
496-
"website](https://help.github.com/en/articles/connecting-to-github-with-ssh). "
496+
"website](https://docs.github.com/en/authentication/connecting-to-github-with-ssh)."
497497
]
498498
}
499499
],

‎ch00git/13Rebase.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"\n",
2121
"### An example rebase\n",
2222
"\n",
23-
"We've built a [repository to help visualise the difference between a merge and a rebase](https://github.com/UCL-RITS/wocky_rebase/blob/main/wocky.md)."
23+
"We've built a [repository to help visualise the difference between a merge and a rebase](https://github.com/UCL-ARC-RSEing-with-Python/wocky_rebase/blob/main/wocky.md)."
2424
]
2525
},
2626
{

‎ch00git/14Bisect.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"source": [
6363
"%%bash\n",
6464
"rm -rf bisectdemo\n",
65-
"git clone https://github.com/UCL-RITS/bisectdemo.git"
65+
"git clone https://github.com/UCL-ARC-RSEing-with-Python/bisectdemo.git"
6666
]
6767
},
6868
{

0 commit comments

Comments
 (0)