From 08971d72de5615ab9d0a208c5b6d92016853dc6b Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Sun, 15 Sep 2024 18:27:09 +0100 Subject: [PATCH 1/8] Git slides WIP --- src/slides/compsoc/3_git.md | 97 ++++++++++++++++++++++++++++++++ src/slides/compsoc/3_git/NAH.jpg | 3 + 2 files changed, 100 insertions(+) create mode 100644 src/slides/compsoc/3_git.md create mode 100644 src/slides/compsoc/3_git/NAH.jpg diff --git a/src/slides/compsoc/3_git.md b/src/slides/compsoc/3_git.md new file mode 100644 index 0000000..3974a46 --- /dev/null +++ b/src/slides/compsoc/3_git.md @@ -0,0 +1,97 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +title = "Git" +date = 2024-09-18 +slides = true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +# Git + +------------------------------------------------------------------------- + +# The 4 Ws of Git + +------------------------------------------------------------------------- + +# WHAT is Git? + +------------------------------------------------------------------------- + +# WHO is Git made for? + +------------------------------------------------------------------------- + +# WHY is Git used? + +------------------------------------------------------------------------- +WHEN is Git used? +------------------------------------------------------------------------- +Last but not least, HOW do we use Git? +------------------------------------------------------------------------- +Let's start with the WHAT +------------------------------------------------------------------------- +Git is tool that's used in the programming Industry. +------------------------------------------------------------------------- +Specifically to track project work done, and the changes to files we've made. +------------------------------------------------------------------------- +The more correct term is Source Control. +------------------------------------------------------------------------- +It is NOT a programming language. +------------------------------------------------------------------------- +Now we move onto the WHO. +------------------------------------------------------------------------- +Git is a tool made for (usually) us programmers to track the work we've done. +------------------------------------------------------------------------- +Programmer socks (not) included. +------------------------------------------------------------------------- +Now we need to ask the WHY. +------------------------------------------------------------------------- +Why would we need a tool like this? +------------------------------------------------------------------------- +Why not use Google Drive instead? +------------------------------------------------------------------------- +I will find your IP address. +------------------------------------------------------------------------- +In all honesty, +------------------------------------------------------------------------- +It's to help keep track of who did what. +------------------------------------------------------------------------- +And to work on unique features... +------------------------------------------------------------------------- +without affecting the main area/branch (we'll come back to this) of our work. +------------------------------------------------------------------------- +Now finally the WHEN. +------------------------------------------------------------------------- +When DO we use git? +------------------------------------------------------------------------- +Because Git keeps track of the changes we've made to files, +------------------------------------------------------------------------- +We can then use it to commit and stage these files, +------------------------------------------------------------------------- +and push them to a place where we can store them. +------------------------------------------------------------------------- +This place is called a Repository. +------------------------------------------------------------------------- +Now I hear you in the audience asking... +------------------------------------------------------------------------- +Why not use SVN? +------------------------------------------------------------------------- +The answer is simple. +------------------------------------------------------------------------- +![NAH](3_git/NAH.jpg) +------------------------------------------------------------------------- +An actual answer is that Git is Distributed, and SVN in centralized. +------------------------------------------------------------------------- +Simply put, devs can store their changes locally on their machines, +------------------------------------------------------------------------- +where on SVN they're stored on a central system. +------------------------------------------------------------------------- +With a central system you NEED to be connected at all times to work on it. +------------------------------------------------------------------------- +You can work locally on git without having to be connected, +------------------------------------------------------------------------- +and then push once you're reconnected. +------------------------------------------------------------------------- +Back to git. +------------------------------------------------------------------------- +Let's start with the basics. +------------------------------------------------------------------------- \ No newline at end of file diff --git a/src/slides/compsoc/3_git/NAH.jpg b/src/slides/compsoc/3_git/NAH.jpg new file mode 100644 index 0000000..46a5931 --- /dev/null +++ b/src/slides/compsoc/3_git/NAH.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b93ccc50179e98170010e340bc6f44382e993e78fe6f46d06912da25acd4c43 +size 18232 From e67e223a1d89657f442f23d8d65527eb5212ebbf Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Wed, 18 Sep 2024 14:54:38 +0100 Subject: [PATCH 2/8] Last bit of the slides --- src/slides/compsoc/3_git.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/slides/compsoc/3_git.md b/src/slides/compsoc/3_git.md index 3974a46..c4b521e 100644 --- a/src/slides/compsoc/3_git.md +++ b/src/slides/compsoc/3_git.md @@ -94,4 +94,6 @@ and then push once you're reconnected. Back to git. ------------------------------------------------------------------------- Let's start with the basics. +------------------------------------------------------------------------- +LIVE DEMONSTRATION TIME ------------------------------------------------------------------------- \ No newline at end of file From b5bc1c260d1ba5e391d4f4971a045c835c4566c5 Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Thu, 19 Sep 2024 11:09:46 +0100 Subject: [PATCH 3/8] Added a bit on commit messages and pulling --- src/slides/compsoc/3_git.md | 6 ++++++ src/slides/compsoc/3_git/bad_message.png | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 src/slides/compsoc/3_git/bad_message.png diff --git a/src/slides/compsoc/3_git.md b/src/slides/compsoc/3_git.md index c4b521e..5a22b20 100644 --- a/src/slides/compsoc/3_git.md +++ b/src/slides/compsoc/3_git.md @@ -96,4 +96,10 @@ Back to git. Let's start with the basics. ------------------------------------------------------------------------- LIVE DEMONSTRATION TIME +------------------------------------------------------------------------- +# DO NOT DO THIS +![BAD](3_git/bad_message.png) +------------------------------------------------------------------------- +# PLEASE DO THIS +````git pull ```` ------------------------------------------------------------------------- \ No newline at end of file diff --git a/src/slides/compsoc/3_git/bad_message.png b/src/slides/compsoc/3_git/bad_message.png new file mode 100644 index 0000000..8d1b2a0 --- /dev/null +++ b/src/slides/compsoc/3_git/bad_message.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca10627c4c15cac9718378ba7cc16b20b74a571a21e1c1658de8fe82bf71a7e8 +size 143553 From 9fe4e96e9f4af3b20d1b58c9affb975a8ab6fedf Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Sun, 22 Sep 2024 21:13:31 +0100 Subject: [PATCH 4/8] Fix: formatting --- src/slides/compsoc/3_git.md | 99 +++++++++++++++++++++++++++++++++---- 1 file changed, 90 insertions(+), 9 deletions(-) diff --git a/src/slides/compsoc/3_git.md b/src/slides/compsoc/3_git.md index 5a22b20..848b11e 100644 --- a/src/slides/compsoc/3_git.md +++ b/src/slides/compsoc/3_git.md @@ -8,98 +8,179 @@ slides = true ------------------------------------------------------------------------- -# The 4 Ws of Git +The 4 Ws of Git ------------------------------------------------------------------------- -# WHAT is Git? +WHAT is Git? ------------------------------------------------------------------------- -# WHO is Git made for? +WHO is Git made for? ------------------------------------------------------------------------- -# WHY is Git used? +WHY is Git used? ------------------------------------------------------------------------- + WHEN is Git used? + ------------------------------------------------------------------------- + Last but not least, HOW do we use Git? + ------------------------------------------------------------------------- + Let's start with the WHAT + ------------------------------------------------------------------------- + Git is tool that's used in the programming Industry. + ------------------------------------------------------------------------- + Specifically to track project work done, and the changes to files we've made. + ------------------------------------------------------------------------- + The more correct term is Source Control. + ------------------------------------------------------------------------- + It is NOT a programming language. + ------------------------------------------------------------------------- + Now we move onto the WHO. + ------------------------------------------------------------------------- + Git is a tool made for (usually) us programmers to track the work we've done. + ------------------------------------------------------------------------- + Programmer socks (not) included. + ------------------------------------------------------------------------- + Now we need to ask the WHY. + ------------------------------------------------------------------------- + Why would we need a tool like this? + ------------------------------------------------------------------------- + Why not use Google Drive instead? + ------------------------------------------------------------------------- + I will find your IP address. + ------------------------------------------------------------------------- + In all honesty, + ------------------------------------------------------------------------- + It's to help keep track of who did what. + ------------------------------------------------------------------------- + And to work on unique features... + ------------------------------------------------------------------------- -without affecting the main area/branch (we'll come back to this) of our work. + +without affecting the main area/branch (we'll return to this) of our work. + ------------------------------------------------------------------------- + Now finally the WHEN. + ------------------------------------------------------------------------- + When DO we use git? + ------------------------------------------------------------------------- + Because Git keeps track of the changes we've made to files, + ------------------------------------------------------------------------- -We can then use it to commit and stage these files, + +We can then use it to commit and stage these files, + ------------------------------------------------------------------------- + and push them to a place where we can store them. + ------------------------------------------------------------------------- + This place is called a Repository. + ------------------------------------------------------------------------- + Now I hear you in the audience asking... + ------------------------------------------------------------------------- + Why not use SVN? + ------------------------------------------------------------------------- + The answer is simple. + ------------------------------------------------------------------------- + ![NAH](3_git/NAH.jpg) + ------------------------------------------------------------------------- + An actual answer is that Git is Distributed, and SVN in centralized. + ------------------------------------------------------------------------- -Simply put, devs can store their changes locally on their machines, + +Simply put, devs can store their changes locally on their machines, + ------------------------------------------------------------------------- + where on SVN they're stored on a central system. + ------------------------------------------------------------------------- + With a central system you NEED to be connected at all times to work on it. + ------------------------------------------------------------------------- + You can work locally on git without having to be connected, + ------------------------------------------------------------------------- + and then push once you're reconnected. + ------------------------------------------------------------------------- + Back to git. + ------------------------------------------------------------------------- + Let's start with the basics. + ------------------------------------------------------------------------- + LIVE DEMONSTRATION TIME + ------------------------------------------------------------------------- -# DO NOT DO THIS + +Please get your laptop out + +------------------------------------------------------------------------- + +Don't do this ![BAD](3_git/bad_message.png) ------------------------------------------------------------------------- -# PLEASE DO THIS + +Please do this ````git pull ```` + ------------------------------------------------------------------------- \ No newline at end of file From 4298096d45b3b6749264936a371e5bd3d86feb55 Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Mon, 23 Sep 2024 22:15:32 +0100 Subject: [PATCH 5/8] Working on getting the idea of time-travel to make sense --- src/slides/compsoc/3_git.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/slides/compsoc/3_git.md b/src/slides/compsoc/3_git.md index 848b11e..b1bbec5 100644 --- a/src/slides/compsoc/3_git.md +++ b/src/slides/compsoc/3_git.md @@ -120,6 +120,14 @@ This place is called a Repository. ------------------------------------------------------------------------- +But, an interesting feature of git, is that it allows you to time-travel. + +------------------------------------------------------------------------- + +Meaning that if a project breaks, you can go back to before it broke. + +------------------------------------------------------------------------- + Now I hear you in the audience asking... ------------------------------------------------------------------------- From 001c985e81688686f05fade6add67f6e5cbb7228 Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Wed, 25 Sep 2024 15:22:17 +0100 Subject: [PATCH 6/8] Feat: Introductory git commands --- src/slides/compsoc/3_git.md | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/slides/compsoc/3_git.md b/src/slides/compsoc/3_git.md index b1bbec5..32e3281 100644 --- a/src/slides/compsoc/3_git.md +++ b/src/slides/compsoc/3_git.md @@ -191,4 +191,28 @@ Don't do this Please do this ````git pull ```` -------------------------------------------------------------------------- \ No newline at end of file +------------------------------------------------------------------------- + +````git init```` + +------------------------------------------------------------------------- + +````git remote add origin ```` + +------------------------------------------------------------------------- + +````git add ```` + +------------------------------------------------------------------------- + +````git commit -m ```` + +------------------------------------------------------------------------- + +````git pull origin ```` + +------------------------------------------------------------------------- + +````git push origin ```` + +------------------------------------------------------------------------- From 96c18575195b6f42c77478e3a086bb96a368e68c Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Wed, 25 Sep 2024 17:28:18 +0100 Subject: [PATCH 7/8] Feat: redid slides --- src/slides/compsoc/3_git.md | 77 +++++++++++++++++++++++++++++------ src/slides/compsoc/img.png | 3 ++ src/slides/compsoc/img_1.png | 3 ++ src/slides/compsoc/img_10.png | 3 ++ src/slides/compsoc/img_11.png | 3 ++ src/slides/compsoc/img_12.png | 3 ++ src/slides/compsoc/img_2.png | 3 ++ src/slides/compsoc/img_3.png | 3 ++ src/slides/compsoc/img_4.png | 3 ++ src/slides/compsoc/img_5.png | 3 ++ src/slides/compsoc/img_6.png | 3 ++ src/slides/compsoc/img_7.png | 3 ++ src/slides/compsoc/img_8.png | 3 ++ src/slides/compsoc/img_9.png | 3 ++ 14 files changed, 103 insertions(+), 13 deletions(-) create mode 100644 src/slides/compsoc/img.png create mode 100644 src/slides/compsoc/img_1.png create mode 100644 src/slides/compsoc/img_10.png create mode 100644 src/slides/compsoc/img_11.png create mode 100644 src/slides/compsoc/img_12.png create mode 100644 src/slides/compsoc/img_2.png create mode 100644 src/slides/compsoc/img_3.png create mode 100644 src/slides/compsoc/img_4.png create mode 100644 src/slides/compsoc/img_5.png create mode 100644 src/slides/compsoc/img_6.png create mode 100644 src/slides/compsoc/img_7.png create mode 100644 src/slides/compsoc/img_8.png create mode 100644 src/slides/compsoc/img_9.png diff --git a/src/slides/compsoc/3_git.md b/src/slides/compsoc/3_git.md index 32e3281..e743b81 100644 --- a/src/slides/compsoc/3_git.md +++ b/src/slides/compsoc/3_git.md @@ -176,43 +176,94 @@ Let's start with the basics. ------------------------------------------------------------------------- -LIVE DEMONSTRATION TIME - -------------------------------------------------------------------------- +# Live demonstration time Please get your laptop out ------------------------------------------------------------------------- +How to download git & git LFS + +------------------------------------------------------------------------- + +## Download +<> + +------------------------------------------------------------------------- + +![img.png](img.png + +------------------------------------------------------------------------- + +![img_1.png](img_1.png) + +------------------------------------------------------------------------- + +![img_2.png](img_2.png) + +------------------------------------------------------------------------- + +![img_3.png](img_3.png) + +------------------------------------------------------------------------- + +![img_4.png](img_4.png) + +------------------------------------------------------------------------- + +![img_5.png](img_5.png) + +------------------------------------------------------------------------- + +<> + + +------------------------------------------------------------------------- Don't do this ![BAD](3_git/bad_message.png) -------------------------------------------------------------------------- - -Please do this -````git pull ```` ------------------------------------------------------------------------- -````git init```` +![img_6.png](img_6.png) ------------------------------------------------------------------------- -````git remote add origin ```` +![img_7.png](img_7.png) ------------------------------------------------------------------------- -````git add ```` +![img_8.png](img_8.png) ------------------------------------------------------------------------- -````git commit -m ```` +Setup SSH key (see Readme.md)) ------------------------------------------------------------------------- -````git pull origin ```` +![img_9.png](img_9.png) ------------------------------------------------------------------------- -````git push origin ```` +![img_10.png](img_10.png) ------------------------------------------------------------------------- + +![img_12.png](img_12.png) + +------------------------------------------------------------------------- + +![img_11.png](img_11.png) + +------------------------------------------------------------------------- + +````bash +git init +git remote add origin +git pull origin +git add +git commit -m "" +git push origin +```` +------------------------------------------------------------------------- + +``https://.users.skynet.ie/`` \ No newline at end of file diff --git a/src/slides/compsoc/img.png b/src/slides/compsoc/img.png new file mode 100644 index 0000000..c42e917 --- /dev/null +++ b/src/slides/compsoc/img.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f129a2c0ffaab3d3347a613d7c6b081801b8fcf35f74c6e18e2a776389bc8020 +size 66338 diff --git a/src/slides/compsoc/img_1.png b/src/slides/compsoc/img_1.png new file mode 100644 index 0000000..075d1fb --- /dev/null +++ b/src/slides/compsoc/img_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cac6c961d163603314e590d2ac21012e54d0297d6a5c680a1278dd3fe9f3a83d +size 21709 diff --git a/src/slides/compsoc/img_10.png b/src/slides/compsoc/img_10.png new file mode 100644 index 0000000..51f7b8a --- /dev/null +++ b/src/slides/compsoc/img_10.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9341c7c436972b714a18660fdfac823e0c316f6b70dc4f49b1f76227b278e9b3 +size 10243 diff --git a/src/slides/compsoc/img_11.png b/src/slides/compsoc/img_11.png new file mode 100644 index 0000000..5337da1 --- /dev/null +++ b/src/slides/compsoc/img_11.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e31c9482b2fd2c91bb8511d02259d8b93b867697b5c6fdf86a93871ffd79caf +size 20991 diff --git a/src/slides/compsoc/img_12.png b/src/slides/compsoc/img_12.png new file mode 100644 index 0000000..90192ff --- /dev/null +++ b/src/slides/compsoc/img_12.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11098766d2846bd3f96e4ca4fd0bde143de0e729aada9bfd2edbebcecb142ae6 +size 2832 diff --git a/src/slides/compsoc/img_2.png b/src/slides/compsoc/img_2.png new file mode 100644 index 0000000..1b6a50f --- /dev/null +++ b/src/slides/compsoc/img_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede2529a17922022246252dd9d7e93c8295a15ad53f92add4202037f2cc75ea4 +size 12213 diff --git a/src/slides/compsoc/img_3.png b/src/slides/compsoc/img_3.png new file mode 100644 index 0000000..7072736 --- /dev/null +++ b/src/slides/compsoc/img_3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25da12821d1dca87684b38ed88a5e731386bcd5de0a650994f29339136af6aec +size 20301 diff --git a/src/slides/compsoc/img_4.png b/src/slides/compsoc/img_4.png new file mode 100644 index 0000000..a800f3b --- /dev/null +++ b/src/slides/compsoc/img_4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a29a7010fe4f61daf8f11ccdab87f1866d00d1f9fb403e4e4879e17b8a60882 +size 24415 diff --git a/src/slides/compsoc/img_5.png b/src/slides/compsoc/img_5.png new file mode 100644 index 0000000..f33babb --- /dev/null +++ b/src/slides/compsoc/img_5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f7ec846689414760e50d83c027cf0ca3d8d0b6bde7e6ed44e8bfb95d3e23999 +size 17633 diff --git a/src/slides/compsoc/img_6.png b/src/slides/compsoc/img_6.png new file mode 100644 index 0000000..0976615 --- /dev/null +++ b/src/slides/compsoc/img_6.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbfcc005d311e1e84b5a7ecbd8572f0384db6618041e89f3caa6457e5670fd6d +size 50537 diff --git a/src/slides/compsoc/img_7.png b/src/slides/compsoc/img_7.png new file mode 100644 index 0000000..87429a0 --- /dev/null +++ b/src/slides/compsoc/img_7.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47dae1990bfd43afb40bbf08fa06fc7f3ac361c8dbb705c8f2ebd0668fb03fae +size 36306 diff --git a/src/slides/compsoc/img_8.png b/src/slides/compsoc/img_8.png new file mode 100644 index 0000000..ec7092c --- /dev/null +++ b/src/slides/compsoc/img_8.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3660f02d595cbeb89b0065a332142ce842e45278dc294a8e25f411b557c1c4da +size 8120 diff --git a/src/slides/compsoc/img_9.png b/src/slides/compsoc/img_9.png new file mode 100644 index 0000000..3546f1e --- /dev/null +++ b/src/slides/compsoc/img_9.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f18da7c01ac92591cf959576833ca9ed497d6eb1b97bd964f36f435d76e3281 +size 5165 From 01bbbb681355a5e8c630ce727cc52da080c28dbb Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Wed, 25 Sep 2024 17:39:41 +0100 Subject: [PATCH 8/8] Fix: added bracket --- src/slides/compsoc/3_git.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slides/compsoc/3_git.md b/src/slides/compsoc/3_git.md index e743b81..89d185b 100644 --- a/src/slides/compsoc/3_git.md +++ b/src/slides/compsoc/3_git.md @@ -191,7 +191,7 @@ How to download git & git LFS ------------------------------------------------------------------------- -![img.png](img.png +![img.png](img.png) -------------------------------------------------------------------------