diff --git a/.ci/.autoRedirect b/.ci/.autoRedirect index 86c16b661d71fa38bbc6011cca139a6681b1e8b2..279624cc1600a90c397bda005ee2eb9abb6acd07 100644 --- a/.ci/.autoRedirect +++ b/.ci/.autoRedirect @@ -1,6 +1,6 @@ <html> <head> -<meta http-equiv="refresh" content="0; url=https://r3.pages.uni.lu/school/basic.git.slides/stable"/> +<meta http-equiv="refresh" content="0; url=https://r3.pages.uni.lu/school/theme/stable"/> </head> <body> diff --git a/.yo-rc.json b/.yo-rc.json index 0732654008a2e55a0a39db913293a2628bfa7ef3..5863c2522292d5db73d0402a2f66e4bf3395738c 100644 --- a/.yo-rc.json +++ b/.yo-rc.json @@ -1,6 +1,6 @@ { "generator-reveal": { - "presentationTitle": "Basic GIT Training", + "presentationTitle": "Template R3 slides", "packageVersion": "0.0.1", "useSass": false } diff --git a/slides/best_practices.md b/slides/best_practices.md deleted file mode 100644 index b139f187935c35c0d2890d425a9617e01b79dbb3..0000000000000000000000000000000000000000 --- a/slides/best_practices.md +++ /dev/null @@ -1,32 +0,0 @@ -## Best practices - -* `pull` before `push` - -* Work on your <font color="red">own</font> branch (in your own fork), and **not** on `master` and **not** on `develop` - -* Do **not push** to `master` or `develop`, but **submit a PR/MR** - -* Get your code **reviewed** by your peers (submit a PR/MR!) - -* Submit a PR/MR **often**! - -* `clone` a repository, do not download the `.zip` file. - - -* Do **not** combine `git` commands - ```bash - $ git commit -am "myMessage" # do not do this - ``` - -* Stage only 1 file at once using - - ```bash - $ git add myFile.txt - ``` - -* Commit **only a few files** at once (after multiple separate `git add` commands) - -* `Push` often - avoid conflicts - -<br><br> -Remember: **A `push` a day keeps conflicts away!** diff --git a/slides/branches.md b/slides/branches.md deleted file mode 100644 index c80f1ed3258aef12d42147347b251ef2a7b6b1b2..0000000000000000000000000000000000000000 --- a/slides/branches.md +++ /dev/null @@ -1,98 +0,0 @@ -## Development scheme - -<br> -Generally, in a repository, there are guidelines for contributing. - -<div class="fragment"> - -<br> -A common development scheme is dual with a: - -- **development** version of the code on `develop` -- **stable** version of the code on `master` - -<br> -A **version** of the code is referred to as a **branch**. - -<div class="fragment"> -<br><br> -<img src="img/icon-live-demo.png" height="100px"> - - -<br> -<font color="red">In the practice repository, the development branch is called `develop`!</font> - -<div class="fragment"> -<br> - Use this dual development scheme for your own repositories! - - -## Branches - -A **version** of the code (i.e., a **branch**) is made up of a sequence of code changes. - -<div class="fragment"> -<br> -These individual code changes are called **commits**. - - -For instance, the `master` and `develop` branches can be represented as a timeline: - -<img src="img/branch-master.png" class="branch-master" /> - - -## Switch between branches - -List all branches of the repository with -```bash -$ git branch -a -``` - -Exit by typing `q`. The branch with the ***** is the current branch. - -<div class="fragment"> -<br> -Checkout another branch -```bash -$ git checkout branchName -``` - -<div class="fragment"> -<br> -You can switch to the `develop` branch with -```bash -$ git checkout develop -``` - -<div class="fragment"> -<br> -<img src="img/icon-live-demo.png" height="100px"> - - -## Create your own version - -Assume that you want to work on a function for adding 2 numbers. - -<div class="fragment"> -<br> -<font color="red">Create a new **branch**!</font> - -```bash -$ git checkout -b add-2-numbers -``` -The `-b` flag creates the branch. - - -Locally, you have your own version now: -<img src="img/branch-create.png" class="branch-create" /> - - -Push your version to your fork: -```bash -$ git push origin add-2-numbers -``` - -<br> -<div class="fragment"> -<br> -<img src="img/icon-live-demo.png" height="100px"> diff --git a/slides/cloneRepo.md b/slides/cloneRepo.md deleted file mode 100644 index 99457b5638e09814cd89803782fb32b57e615bdb..0000000000000000000000000000000000000000 --- a/slides/cloneRepo.md +++ /dev/null @@ -1,18 +0,0 @@ -## How do I start working on a repository? - -You have to `clone` it first: - -```bash -$ git clone git@github.com:userName/myRepo.git myRepo -``` - -<div class="fragment"> -<br> -If you did not configure your SSH key, clone using HTTPS: -```bash -$ git clone https://github.com/userName/myRepo.git myRepo -``` - -<br> -<div class="fragment"> -You will be prompted to enter your credentials. diff --git a/slides/configuration.md b/slides/configuration.md deleted file mode 100644 index 48f9eea53d0cd86ab278322061fa5651320a8b7b..0000000000000000000000000000000000000000 --- a/slides/configuration.md +++ /dev/null @@ -1,56 +0,0 @@ -## How to configure `git`? - -```bash -$ git config --global user.name "Firstname Lastname" -$ git config --global user.email "first.last@uni.lu" -``` - - -## Test the configuration - -Test whether your username and email have been registered - -```bash -$ git config --list -``` - -<br> -This should list the configuration with `user.name` and `user.email`. - -<br> -Exit by typing `q`. - - -## What is an SSH key? - -An SSH key is a secure access credential. - -<div class="fragment"> -<br> -**Principle**: <br><br> -Communicate **securely** with Github/Gitlab **without** entering the username/password. - - -## How do I get and set my SSH key? - -<br> -Check if you already have an SSH key: - -```bash -$ ls -al ~/.ssh -``` -<br> -If there are 2 files named `id_rsa`, you have an SSH key. - -<div class="fragment"> -<br><br> -If you don’t have yet an SSH key, you have to generate one: -```bash -$ ssh-keygen -t rsa # -b 4096 -``` - -<br> -Then, add the SSH key to Github/Gitlab. - -<div class="fragment"> -<img src="img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/slides/essential_commands.md b/slides/essential_commands.md deleted file mode 100644 index b0a42e1682bb90d641b97bb6f749eb9edd602a1f..0000000000000000000000000000000000000000 --- a/slides/essential_commands.md +++ /dev/null @@ -1,119 +0,0 @@ -## The 5 essential commands - -<br> -**Yes**, you only need 5 commands! - -<br> -`pull, status, add, commit, push` - -<br> -or in other words (remember these!): -```bash -$ git pull <remote> <branch> -$ git status -$ git add myFile.txt # example -$ git commit -m "myMessage" # example -$ git push <remote> <branch> -``` - - -## Pull the latest version of an existing branch - -Pull the latest revision on branch `add-2-numbers`: -```bash -$ git pull origin add-2-numbers -# Already up to date -``` - -<div class="fragment"> -<br> -Verify its `status` with: -```bash -$ git status -``` - - -## Modify a file - -Modify and rename `addTwoNumbers.m` in the folder `src/firstCommit` as `addTwoNumbers_myName`: - -```bash -$ cd src/firstCommit -$ git mv addTwoNumbers_myName.m addTwoNumbers_laurent.m # replace myName -``` - -<br> -Open the file using the `Visual Studio Code` editor (or any other editor) -and correct the line -```Matlab -c = a - b; -``` - - -## Add your file to the stage - -First, check the repository status -```bash -$ git status -# uncommitted changes (displayed in red) -``` - -<div class="fragment"> -<br> -**ADVANCED**: see your changes in the terminal -```bash -$ git diff -``` -exit with `q` - -<div class="fragment"> -<br> -Now, add the file (bring it on stage) -```bash -$ git add addTwoNumbers_laurent.m # replace myName -$ git status -# returns the same as before, generally in green (means staged) -``` - - - -## Add a commit message - -```bash -$ git commit -m "Correcting formula for adding 2 numbers" -$ git status -``` - - -## Push your file to your fork - -```bash -$ git push origin add-2-numbers -``` - -<div class="fragment"> -<br> -**ADVANCED**: see the log of all the commits (and your last one) in the terminal -```bash -$ git log -``` -exit by typing `q` - - -## Do it yourself - -**Exercice 1:** - -* Edit the test in `test/suite` - -<div class="fragment"> -<br> -<img src="img/icon-live-demo.png" height="100px"> - -<div class="fragment"> -**Exercice 2:** - -* Checkout a new branch named `multiply-2-numbers` -* Rename and modify `src/secondCommit/multiplyTwoNumbers_myName.m` -* Push the file `src/secondCommit/multiplyTwoNumbers_myName.m` -* Don't forget to edit <font color="red">`_myName`</font> \ No newline at end of file diff --git a/slides/forks.md b/slides/forks.md deleted file mode 100644 index c5aa8bc801f7df0fcfce2c0a7cb5606b70827774..0000000000000000000000000000000000000000 --- a/slides/forks.md +++ /dev/null @@ -1,89 +0,0 @@ - -## What is a `fork`? - -<div class="fragment"> -<img src="img/fork.jpg" class="as-is" /> -[//]: <> (http://www.cndajin.com/data/wls/246/22302193.jpg) - - -## Not really ... -<img src="img/fork-crossed.png" class="as-is" /> - - -## What is a `fork`? -In general, when contributing to a repository, you only have **read** access. - -<div class="fragment"> -In other words, you can only **pull** (unless it is your own repository or access has been granted). - -<div class="fragment"> -<br> -In general, you **cannot write** changes. In other words, you do not have **push** access. - -<div class="fragment"> -You have to work on your **own copy**. - -<div class="fragment"> -<br> -In other words, you have to work on your own <font color="red">**fork**</font>. - - -## How to get a fork? - -Browse to the original repository and click on the button `Fork`: - - - -<div class="fragment"> -<img src="img/icon-live-demo.png" height="100px"> - - -## Time to practice! - -<br> - -Fork the practice repository: <br><br> -https://git-r3lab.uni.lu/R3school/git.practice - -Then, clone your fork to your home directory! - -<div class="fragment"> -<br> -<img src="img/icon-live-demo.png" height="100px"> - -<div class="fragment"> -<br> -```bash -$ git clone ssh://git@git-r3lab-server.uni.lu:8022/yourUserName/ - git.practice.git practice -``` - -<br> -Change to the practice directory with: -```bash -$ cd practice -``` - - -<font color="red"> -Any other rudimentary method such as - -*'I simply download the `.zip` and unzip it - works like a charm!'* - -shall **be avoided**! -</font> - -<div class="fragment"> -<br>Why? - - -## How to update my fork? - -As you have your own fork, it will not automatically update once the original repository is update. - - You have to update it yourself! - -<div class="fragment"> -<br> -**More on that later!** - diff --git a/slides/github_gitlab.md b/slides/github_gitlab.md deleted file mode 100644 index a9bc1f27e5abefac55edc64dbc47ecca606816b4..0000000000000000000000000000000000000000 --- a/slides/github_gitlab.md +++ /dev/null @@ -1,28 +0,0 @@ -## GitHub and GitLab - -<img src="https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png" alt="GitHub" style="width: 200px;"/> -<img src="https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-extra-whitespace.png" alt="GitLab" style="width: 200px;"/> - -GitHub and GitLab are VCS systems. - -GitHub is **public**, whereas GitLab is **restricted/private**. - -Positive point: GitHub and GitLab are (almost) the same. - - -## GitHub - -[https://github.com](https://github.com) -<br><img src="https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png" alt="GitHub" style="width: 200px;"/> - -<div class="fragment"> -<img src="img/icon-live-demo.png" height="100px"> - - -## GitLab - -[https://git-r3lab.uni.lu](https://git-r3lab.uni.lu) -<br><img src="https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-extra-whitespace.png" alt="GitLab" style="width: 200px;"/> - -<div class="fragment"> -<img src="img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/slides/homework.md b/slides/homework.md deleted file mode 100644 index 2e23c5139bd95786c6aaa433cd95e6e1e3d25904..0000000000000000000000000000000000000000 --- a/slides/homework.md +++ /dev/null @@ -1,44 +0,0 @@ -## Homework - -Ideally, do this exercise on a computer on which `Matlab` or `octave` **are** installed. - -<div class="fragment"> -<br> -More information on how install these software are on [mathworks.com](www.mathworks.com]) or on [gnu.org/software/octave](gnu.org/software/octave) - -<div class="fragment"> -<br> -Don't forget to properly configure `git` with your username and email as explained in the training slides. - - -## Detailed instructions - -- First, fork the [https://git-r3lab.uni.lu/R3school/git.practice](https://git-r3lab.uni.lu/R3school/git.practice) repository. - -- Create the new branch `homework_myName`. - -- Implement a new function (create a new file `sqrt_myName.m` in a new folder `src/thirdCommit`) called `sqrt_myName(x)` that computes the square root of `x`. - -- Rename the `test.m` file in the `test/suite` directory to `test_myName.m`. - -- Edit the file `test.m` and change the names of the functions accordingly. - - -- Before submitting the merge request, verify locally that your code is running properly. - - To do so, open the MATLAB application and type `matlabroot`. This will return the path to the MATLAB application. Note or copy this path and exit MATLAB. - NOTE: Do not copy the apostrophes, as they just denote the returned string. - - Open the Terminal and execute the following command: - ```sh - $ matlabroot/bin/matlab -nodesktop -nosplash < test_testAll.m - ``` - and verify that no error is reported. - NOTE: `matlabroot`in the terminal window refers to the copied path from the previous instruction. - -- Create a merge-request. - -- Assign @laurent.heirendt and your merge-request will be reviewed. - -<br> -That's it! diff --git a/slides/img/Git-Logo-Black.png b/slides/img/Git-Logo-Black.png deleted file mode 100644 index b7ed63f2d105656638665907bab77c5e4e375b3d..0000000000000000000000000000000000000000 Binary files a/slides/img/Git-Logo-Black.png and /dev/null differ diff --git a/slides/img/branch-commit.png b/slides/img/branch-commit.png deleted file mode 100644 index 4d31b951c7e0c05027f40566650ce1dfab36a6a1..0000000000000000000000000000000000000000 Binary files a/slides/img/branch-commit.png and /dev/null differ diff --git a/slides/img/branch-create.png b/slides/img/branch-create.png deleted file mode 100644 index 4ae4e4d42e620d49c6b5592037767805bd5b2188..0000000000000000000000000000000000000000 Binary files a/slides/img/branch-create.png and /dev/null differ diff --git a/slides/img/branch-master.png b/slides/img/branch-master.png deleted file mode 100644 index 37a8d0c3befc269d562a86e9eae23afd9b2ece15..0000000000000000000000000000000000000000 Binary files a/slides/img/branch-master.png and /dev/null differ diff --git a/slides/img/branch-merge.png b/slides/img/branch-merge.png deleted file mode 100644 index b3f4687642cdf98cf086e7d03c86eccea212ed65..0000000000000000000000000000000000000000 Binary files a/slides/img/branch-merge.png and /dev/null differ diff --git a/slides/img/bulb.png b/slides/img/bulb.png deleted file mode 100644 index 590f8d9270fea6be86b5e356cb07cd9232ef7056..0000000000000000000000000000000000000000 Binary files a/slides/img/bulb.png and /dev/null differ diff --git a/slides/img/fork-crossed.png b/slides/img/fork-crossed.png deleted file mode 100644 index cd93216af30439024a36d2d6355d0eae28324511..0000000000000000000000000000000000000000 Binary files a/slides/img/fork-crossed.png and /dev/null differ diff --git a/slides/img/fork.jpg b/slides/img/fork.jpg deleted file mode 100644 index 35ef53f4225b9286280c99d2c23f1594d380d6c5..0000000000000000000000000000000000000000 Binary files a/slides/img/fork.jpg and /dev/null differ diff --git a/slides/img/git_definition.png b/slides/img/git_definition.png deleted file mode 100644 index 0676fc7a299fae5c7c3389eed91e21fcb050c629..0000000000000000000000000000000000000000 Binary files a/slides/img/git_definition.png and /dev/null differ diff --git a/slides/img/github_app.png b/slides/img/github_app.png deleted file mode 100644 index 3cc77f55371f4fdd960e778e4dfcfa5eee1adca4..0000000000000000000000000000000000000000 Binary files a/slides/img/github_app.png and /dev/null differ diff --git a/slides/img/graffle/branch-i-state.graffle b/slides/img/graffle/branch-i-state.graffle deleted file mode 100644 index 7f2e3d401791c62cb2c615fec2dce64c4a6fb787..0000000000000000000000000000000000000000 Binary files a/slides/img/graffle/branch-i-state.graffle and /dev/null differ diff --git a/slides/img/graffle/fork.graffle/data.plist b/slides/img/graffle/fork.graffle/data.plist deleted file mode 100644 index b133d0e9ea14871d87e9c81142e1f828e1f0bc35..0000000000000000000000000000000000000000 Binary files a/slides/img/graffle/fork.graffle/data.plist and /dev/null differ diff --git a/slides/img/graffle/fork.graffle/image1.tiff b/slides/img/graffle/fork.graffle/image1.tiff deleted file mode 100644 index 98af73f494081c2102ae172be5d2df45588ee3ca..0000000000000000000000000000000000000000 Binary files a/slides/img/graffle/fork.graffle/image1.tiff and /dev/null differ diff --git a/slides/img/graffle/fork.graffle/image2.tiff b/slides/img/graffle/fork.graffle/image2.tiff deleted file mode 100644 index 21127c00eebbf4f4bf48a076df8560c44afb57ca..0000000000000000000000000000000000000000 Binary files a/slides/img/graffle/fork.graffle/image2.tiff and /dev/null differ diff --git a/slides/img/icon-live-demo.png b/slides/img/icon-live-demo.png deleted file mode 100644 index 4b9e6f031078329479b4cc8ea875b9657fda224a..0000000000000000000000000000000000000000 Binary files a/slides/img/icon-live-demo.png and /dev/null differ diff --git a/slides/img/installation.png b/slides/img/installation.png deleted file mode 100644 index dd278a70c5e8237d32c047759e47fb0812db9db0..0000000000000000000000000000000000000000 Binary files a/slides/img/installation.png and /dev/null differ diff --git a/slides/img/sbgBackgroundWhite.jpg b/slides/img/sbgBackgroundWhite.jpg deleted file mode 100644 index 957b9cdb55c95d89bb21f67381bdea2855515a2f..0000000000000000000000000000000000000000 Binary files a/slides/img/sbgBackgroundWhite.jpg and /dev/null differ diff --git a/slides/img/whiteBG.jpg b/slides/img/whiteBG.jpg deleted file mode 100644 index 85212b4fa12b9a27711119a2eb984a10dbf8223f..0000000000000000000000000000000000000000 Binary files a/slides/img/whiteBG.jpg and /dev/null differ diff --git a/slides/installation.md b/slides/installation.md deleted file mode 100644 index deec7d09a434edccdd7916dd65b4cb66daa93c2e..0000000000000000000000000000000000000000 --- a/slides/installation.md +++ /dev/null @@ -1,44 +0,0 @@ -## Installation of `git` - -<img src="img/github_app.png" class="as-is" height="200" /> - -**macOS** - -Install *Xcode Command Line Tools* - -<br> -**Windows** - -Install Git Bash: <br>`https://git-scm.com/download/win` - -<br> -**Linux (Ubuntu)** - -```bash -$ sudo apt-get install git-all -``` - - -## How to get started? - -**macOS** - -Start the `Terminal` or `iTerm`. - -<br> -**Windows** - -Start `GUI Bash`. - -<br> -**Linux (Ubuntu)** - -Start the `Terminal` or `Terminator`. - - -## Is `git` properly installed? - -```bash -$ git --version -# git version 2.10.0 -``` \ No newline at end of file diff --git a/slides/list.json b/slides/list.json index c4e241411ec5989786e7b4a06204095ac0c8453f..aad8862e151d98721de4783f3f1fedfe5983ea9d 100644 --- a/slides/list.json +++ b/slides/list.json @@ -9,89 +9,6 @@ "attr": { } }, - { - "filename": "the_terminal.md", - "attr": { - } - }, - { - "filename": "the_editor.md", - "attr": { - - } - }, - { - "filename": "what_is_git.md", - "attr": { - - } - }, - { - "filename": "installation.md", - "attr": { - - } - }, - { - "filename": "github_gitlab.md", - "attr": { - - } - }, - { - "filename": "configuration.md", - "attr": { - - } - }, - { - "filename": "cloneRepo.md", - "attr": { - - } - }, - { - "filename": "forks.md", - "attr": { - - } - }, - { - "filename": "branches.md", - "attr": { - - } - }, - { - "filename": "essential_commands.md", - "attr": { - - } - }, - { - "filename": "merge.md", - "attr": { - - } - }, - { - "filename": "syncFork.md", - "attr": { - - } - }, - { - "filename": "best_practices.md", - "attr": { - - } - }, - { - "filename": "homework.md", - "attr": { - - } - }, { "filename": "thanks.md", "attr": { diff --git a/slides/merge.md b/slides/merge.md deleted file mode 100644 index e7b39dd1ec103b520eeecc35f2e853258f29e707..0000000000000000000000000000000000000000 --- a/slides/merge.md +++ /dev/null @@ -1,17 +0,0 @@ -## Pull and merge requests - -If you want your changes to be reflected on the `develop` or `master` branches, -**submit a MR or a PR** via the Github/Gitlab interface. - -<br> -Use the **interface** to make use of your peers to review your code! - -<img src="img/branch-merge.png" class="branch-merge" /> - - -<br> -Once merged, you can delete the branch via the interface. - -<div class="fragment"> -<br> -<img src="img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/slides/overview.md b/slides/overview.md index b6fdb1f93f877caa319acb75f2890ed3283c9c39..5ab544679aacd1eb093a1ca3f63e41b3af42d44b 100644 --- a/slides/overview.md +++ b/slides/overview.md @@ -1,16 +1,4 @@ ## Overview -0. The terminal -1. The editor -2. What is `git`? What is the use of `git`? <!--(5 min)//--> -3. Installation of `git` -4. GitHub and GitLab <!--(5min)//--> -5. How do I configure `git`? <!--(5min)//--> -6. Where and how to start <!--(5min)//--> -7. What is a fork? <!--(5min)//--> -8. What are branches? -9. The 5 essential commands <!--(10 min)//--> - * `pull` / `status` / `add` / `commit` / `push` -10. What are merge/pull requests? <!--(10 min)//--> -11. How do I synchronize my fork? -12. Best practices \ No newline at end of file +0. Subject 1 +1. Subject 2 \ No newline at end of file diff --git a/slides/syncFork.md b/slides/syncFork.md deleted file mode 100644 index 3cfbd94a8eab8e9e21170e6612210ed80dc22cff..0000000000000000000000000000000000000000 --- a/slides/syncFork.md +++ /dev/null @@ -1,42 +0,0 @@ -## Synchronize your fork - - Remember, we have to regularly update our own copy of the code. - - -## Add the address of the original repository - -Add the `upstream` address (original/protected repository) -```bash -$ git remote add upstream ssh://git@git-r3lab-server.uni.lu:8022/R3school/ - git.practice.git -``` - - Note the change in the URL. - - -<br> -You can then check whether the remote address is set correctly -```bash -$ git remote -v -``` - -<div class="fragment"> -<br> -Fetch the changes from upstream (similar to pull) -```bash -$ git fetch upstream -``` - -<div class="fragment"> -<br> -Merge the retrieved changes on the `master` branch: -```bash -$ git checkout master -$ git merge upstream/master -$ git push origin master -``` - -<div class="fragment"> -Do the same for the `develop` branch. - -<img src="img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/slides/thanks.md b/slides/thanks.md index 7337d53f0c95ed0f7d3bca99e1b6afa1cb59552b..495f26d9d2a7207db561ebada884add8cdc8015c 100644 --- a/slides/thanks.md +++ b/slides/thanks.md @@ -1,41 +1,8 @@ -### Let's refresh our memories - -<div class="fragment"> -<br> -- What is a **fork**? - -<div class="fragment"> -<br> -- What are **branches**? - -<div class="fragment"> -<br> -- Can I have **multiple branches** in my fork? - -<div class="fragment"> -<br> -- What is a good **development scheme**? - -<div class="fragment"> -<br> -- What are the **5 essential commands**? - - -### References & Cheat sheet - -[1]: **Git** Book: -https://git-scm.com/book/en/v2 - -<br>[2]: GitHub training services: https://services.github.com/training/ - -<br>[3]: Cheat sheet: http://rogerdudler.github.io/git-guide - - ## Thank you. -<img src="img/r3-training-logo.png" height="200px"> +<center><img src="img/r3-training-logo.png" height="200px"></center> Contact us if you need help: -r3lab.core@uni.lu +<a href="mailto:r3lab.core@uni.lu">r3lab.core@uni.lu</a> diff --git a/slides/the_editor.md b/slides/the_editor.md deleted file mode 100644 index 6a9ad3b5974c7640cbfd252eb1fded5854105f6b..0000000000000000000000000000000000000000 --- a/slides/the_editor.md +++ /dev/null @@ -1,11 +0,0 @@ -## The editor - -Recommended editors: - -- **Visual Studio Code** <br>(https://code.visualstudio.com) -- **Atom** <br>(https://atom.io) - - -## Visual Studio Code - -<br><img src="img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/slides/the_terminal.md b/slides/the_terminal.md deleted file mode 100644 index 61f9a9cc51ecccb12433f73a6de534f21c1d70b7..0000000000000000000000000000000000000000 --- a/slides/the_terminal.md +++ /dev/null @@ -1,87 +0,0 @@ -## The terminal (shell) - -<br> -**UNIX users (macOS & Linux):** - -Start the Terminal from your `/Applications` directoy. - - Install iTerm2: `https://www.iterm2.com` - -<br> -**Windows users:** - -Install Git Bash: <br>`https://git-scm.com/download/win` - -<br> -**Linux users:** - -Launch default terminal.<br> - Install Terminator: `https://launchpad.net/terminator` - - - -## First steps in the terminal - -Starting the terminal presents itself with a line where you can enter a command -```bash -cesar@myComputer> -``` - -<div class="fragment"> -<br> -Often written, for covenience, as -```bash -$ -``` - -<br> -When you open your terminal (shell), you are located -in your home directory (unless otherwise configured), denoted as `~/`. - - -## Essential Linux commands - -List the contents of a directory -```bash -$ ls #-lash -``` - -<div class="fragment"> -<br> -Create a directory -```bash -$ mkdir myNewDirectory -``` - -<div class="fragment"> -<br> -Change the directory to a specific folder -```bash -$ cd myNewDirectory -``` - - -<br> -Change the directory 1 level and 2 levels up -```bash -$ cd .. -# 1 level up - -$ cd ../.. -# 2 levels up -``` - -<div class="fragment"> -<br> -Move a file or a directory -```bash -$ mv myFile.m myNewDirectory/. -``` - -<div class="fragment"> -<br> -Rename a file or a directory -```bash -$ mv myFile.m myNewFile.m -$ mv myNewDirectory myDirectory -``` diff --git a/slides/what_is_git.md b/slides/what_is_git.md deleted file mode 100644 index f33694ff2c6f3177273d3f6bb519432cca1ec810..0000000000000000000000000000000000000000 --- a/slides/what_is_git.md +++ /dev/null @@ -1,36 +0,0 @@ -## What is `git`? - -<!--  --> - -`git` is a **version control system** (VCS) for tracking changes in computer files and coordinating work on those files among multiple people [1]. - -<br><br><br>Designed and implemented in 2005 by **Linus Torvalds** - - - -<div align="left"><small>[1] *https://en.wikipedia.org/wiki/Git*</small></div> - - -## The inventor of `git` - - -<br><br> -``` -I'm an egotistical bastard, and I name all my projects after myself. -First Linux, now git. -``` -Linus Torvald (2007-06-14) - - -## What is the use of `git`? - -* No need to fully rewrite code; **reuse code** and **save time** -* Keep the changes you made over time (**history**) -* Allows you to **backtrack** (if necessary) and undo unwanted changes -* Easily **add contributions** of your collaborators to the main code base - -note: - -Other points to mention: -* git shall not be considered as a nuisance, but as a tool that should help to track and trace the code. -* git is not to track performance. Not using it shows exactly the opposite.