🥑-ise the lesson: from planets to recipes

Migrated old changes made to the styles lesson but as sandpaper
This includes the changes done to:
5c3f297
ca6d833
376bc11

README.md

@@ -1,15 +1,17 @@
 [![Create a Slack Account with us](https://img.shields.io/badge/Create_Slack_Account-The_Carpentries-071159.svg)](https://swc-slack-invite.herokuapp.com/)
 [![Slack Status](https://img.shields.io/badge/Slack_Channel-swc--git-E01563.svg)](https://swcarpentry.slack.com/messages/C91JS49HD)
 
-# git-novice
+# # UCL's git-novice
 
-An introduction to version control for novices using Git.
-Please see [https://swcarpentry.github.io/git-novice/](https://swcarpentry.github.io/git-novice/) for a rendered version of this material,
+An introduction to version control for novices using Git (with the UCL's twist).
+Please see [the rendered version of this material](https://github-pages.ucl.ac.uk/git-novice/),
 [the lesson template documentation][lesson-example]
 for instructions on formatting, building, and submitting material,
 or run `make` in this directory for a list of helpful commands.
 
-Maintainers:
+## Maintainers:
+
+## Upstream
 
 - [Nima Hejazi][hejazi_nima]: [@nhejazi](https://github.com/nhejazi)
 - [Kat Koziar][koziar_kat]: [@kekoziar](https://github.com/kekoziar)
@@ -20,6 +22,10 @@ Alumni maintainers:
 - [Ivan Gonzalez][gonzalez_ivan]: [@iglpdc](https://github.com/iglpdc)
 - [Daisie Huang][huang_daisie]: [@daisieh](https://github.com/daisieh)
 
+## UCL's
+
+- David Pérez-Suárez [@dpshelio](https://github.com/dpshelio)
+
 [lesson-example]: https://swcarpentry.github.io/lesson-example
 [hejazi_nima]: https://carpentries.org/instructors/#nhejazi
 [koziar_kat]: https://carpentries.org/instructors/#kekoziar

episodes/02-setup.md

@@ -27,14 +27,14 @@ of configurations we will set as we get started with Git:
 
 On a command line, Git commands are written as `git verb options`,
 where `verb` is what we actually want to do and `options` is additional optional information which may be needed for the `verb`. So here is how
-Dracula sets up his new laptop:
+Alfredo sets up his new laptop:
 
 ```bash
-$ git config --global user.name "Vlad Dracula"
-$ git config --global user.email "vlad@tran.sylvan.ia"
+$ git config --global user.name "Alfredo Linguini"
+$ git config --global user.email "a.linguini@ratatouille.fr"
 ```
 
-Please use your own name and email address instead of Dracula's. This user name and email will be associated with your subsequent Git activity,
+Please use your own name and email address instead of Alfredo's. This user name and email will be associated with your subsequent Git activity,
 which means that any changes pushed to
 [GitHub](https://github.com/),
 [BitBucket](https://bitbucket.org/),
@@ -79,12 +79,12 @@ $ git config --global core.autocrlf input
 And on Windows:
 
 ```bash
-$ git config --global core.autocrlf false
+$ git config --global core.autocrlf true
 ```
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 
-Dracula also has to set his favorite text editor, following this table:
+Alfredo also has to set his favorite text editor, following this table:
 
 | Editor                                | Configuration command | 
 | :-----------                          | :------------------------------ |
@@ -118,7 +118,7 @@ If you want to save your changes and quit, press <kbd>Esc</kbd> then type `:wq`
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 
 Git (2.28+) allows configuration of the name of the branch created when you
-initialize any new repository.  Dracula decides to use that feature to set it to `main` so
+initialize any new repository.  Alfredo decides to use that feature to set it to `main` so
 it matches the cloud service he will eventually use.
 
 ```bash

episodes/03-create.md

@@ -20,32 +20,17 @@ exercises: 0
 Once Git is configured,
 we can start using it.
 
-We will continue with the story of Wolfman and Dracula who are investigating if it
-is possible to send a planetary lander to Mars.
-
-![](fig/motivatingexample.png){alt='motivatingexample'}
-[Werewolf vs dracula](https://www.deviantart.com/b-maze/art/Werewolf-vs-Dracula-124893530)
-by [b-maze](https://www.deviantart.com/b-maze) / [Deviant Art](https://www.deviantart.com/).
-[Mars](https://en.wikipedia.org/wiki/File:OSIRIS_Mars_true_color.jpg) by European Space Agency /
-[CC-BY-SA 3.0 IGO](https://creativecommons.org/licenses/by/3.0/deed.en).
-[Pluto](https://commons.wikimedia.org/wiki/File:PIA19873-Pluto-NewHorizons-FlyingPastImage-20150714-transparent.png) /
-Courtesy NASA/JPL-Caltech.
-[Mummy](https://commons.wikimedia.org/wiki/File:Mummy_icon_-_Noun_Project_4070.svg)
-© Gilad Fried / [The Noun Project](https://thenounproject.com/) /
-[CC BY 3.0](https://creativecommons.org/licenses/by/3.0/deed.en).
-[Moon](https://commons.wikimedia.org/wiki/File:Lune_ico.png)
-© Luc Viatour / [https://lucnix.be](https://lucnix.be/) /
-[CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/deed.en).
+We will help Alfredo with his new project, create a repository with all his recipes.
 
 First, let's create a new directory in the `Desktop` folder for our work and then change the current working directory to the newly created one:
 
 ```bash
 $ cd ~/Desktop
-$ mkdir planets
-$ cd planets
+$ mkdir recipes
+$ cd recipes
 ```
 
-Then we tell Git to make `planets` a [repository](../learners/reference.md#repository)
+Then we tell Git to make `recipes` a [repository](../learners/reference.md#repository)
 \-- a place where Git can store versions of our files:
 
 ```bash
@@ -54,9 +39,9 @@ $ git init
 
 It is important to note that `git init` will create a repository that
 can include subdirectories and their files---there is no need to create
-separate repositories nested within the `planets` repository, whether
+separate repositories nested within the `recipes` repository, whether
 subdirectories are present from the beginning or added later. Also, note
-that the creation of the `planets` directory and its initialization as a
+that the creation of the `recipes` directory and its initialization as a
 repository are completely separate processes.
 
 If we use `ls` to show the directory's contents,
@@ -67,7 +52,7 @@ $ ls
 ```
 
 But if we add the `-a` flag to show everything,
-we can see that Git has created a hidden directory within `planets` called `.git`:
+we can see that Git has created a hidden directory within `recipes` called `.git`:
 
 ```bash
 $ ls -a
@@ -117,33 +102,33 @@ wording of the output might be slightly different.
 
 ## Places to Create Git Repositories
 
-Along with tracking information about planets (the project we have already created),
-Dracula would also like to track information about moons.
-Despite Wolfman's concerns, Dracula creates a `moons` project inside his `planets`
+Along with tracking information about recipes (the project we have already created),
+Alfredo would also like to track information about cocktails.
+Despite Jimmy's concerns, Alfredo creates a `cocktails` project inside his `recipes`
 project with the following sequence of commands:
 
 ```bash
-$ cd ~/Desktop   # return to Desktop directory
-$ cd planets     # go into planets directory, which is already a Git repository
-$ ls -a          # ensure the .git subdirectory is still present in the planets directory
-$ mkdir moons    # make a subdirectory planets/moons
-$ cd moons       # go into moons subdirectory
-$ git init       # make the moons subdirectory a Git repository
-$ ls -a          # ensure the .git subdirectory is present indicating we have created a new Git repository
+$ cd ~/Desktop    # return to Desktop directory
+$ cd recipes      # go into recipes directory, which is already a Git repository
+$ ls -a           # ensure the .git subdirectory is still present in the recipes directory
+$ mkdir cocktails # make a sub-directory recipes/cocktails
+$ cd cocktails    # go into cocktails subdirectory
+$ git init        # make the cocktails subdirectory a Git repository
+$ ls -a           # ensure the .git subdirectory is present indicating we have created a new Git repository
 ```
 
-Is the `git init` command, run inside the `moons` subdirectory, required for
-tracking files stored in the `moons` subdirectory?
+Is the `git init` command, run inside the `cocktails` subdirectory, required for
+tracking files stored in the `cocktails` subdirectory?
 
 :::::::::::::::  solution
 
 ## Solution
 
-No. Dracula does not need to make the `moons` subdirectory a Git repository
-because the `planets` repository can track any files, sub-directories, and
-subdirectory files under the `planets` directory.  Thus, in order to track
-all information about moons, Dracula only needed to add the `moons` subdirectory
-to the `planets` directory.
+No. Alfredo does not need to make the `cocktails` subdirectory a Git repository
+because the `recipes` repository will track all files, sub-directories, and
+subdirectory files under the `recipes` directory.  Thus, in order to track
+all information about cocktails, Alfredo only needed to add the `cocktails` subdirectory
+to the `recipes` directory.
 
 Additionally, Git repositories can interfere with each other if they are "nested":
 the outer repository will try to version-control
@@ -165,9 +150,9 @@ fatal: Not a git repository (or any of the parent directories): .git
 
 ## Correcting `git init` Mistakes
 
-Wolfman explains to Dracula how a nested repository is redundant and may cause confusion
-down the road. Dracula would like to remove the nested repository. How can Dracula undo
-his last `git init` in the `moons` subdirectory?
+Jimmy explains to Alfredo how a nested repository is redundant and may cause confusion
+down the road. Alfredo would like to remove the nested repository. How can Alfredo undo
+his last `git init` in the `cocktails` subdirectory?
 
 :::::::::::::::  solution
 
@@ -190,11 +175,11 @@ becomes another change that we will need to track, as we will see in the next ep
 ### Solution
 
 Git keeps all of its files in the `.git` directory.
-To recover from this little mistake, Dracula can just remove the `.git`
-folder in the moons subdirectory by running the following command from inside the `planets` directory:
+To recover from this little mistake, Alfredo can just remove the `.git`
+folder in the cocktails subdirectory by running the following command from inside the `recipes` directory:
 
 ```bash
-$ rm -rf moons/.git
+$ rm -rf cocktails/.git
 ```
 
 But be careful! Running this command in the wrong directory will remove