Skip to content

Commit

Permalink
feat: add Introduction to git slides to version control docs and fix …
Browse files Browse the repository at this point in the history
…up quick git tips
  • Loading branch information
jjjermiah committed Nov 29, 2024
1 parent 401bd09 commit 2f39ee8
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 2 deletions.
6 changes: 6 additions & 0 deletions docs/software_development/Version_Control/.pages
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
title: Version Control

nav:
- git
- code_reviews
- ...
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
title: Code Review Presentation
description: A presentation on code reviews
author: Jermiah Joseph
---
# Code Review Presentation

This presentation was presented on November 26th, 2024, and summarizes the docs on code reviews in a slide format.

Expand Down
26 changes: 26 additions & 0 deletions docs/software_development/Version_Control/git/introduction.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Below are the slides presented at the first workshop on Git. Full screen at [this link](https://docs.google.com/presentation/d/e/2PACX-1vThaf35wv1vIOuElWsN1cCfrruEzQ9ZHwlPA7061UZ3TMsM7PK1rY9qLhz5xojkS-sREJpxM5ipOk2Y/embed?start=false&loop=true&delayms=60000)

<iframe src="https://docs.google.com/presentation/d/e/2PACX-1vThaf35wv1vIOuElWsN1cCfrruEzQ9ZHwlPA7061UZ3TMsM7PK1rY9qLhz5xojkS-sREJpxM5ipOk2Y/embed?start=false&loop=true&delayms=60000" frameborder="0" width="1440" height="839" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>

These slides can also be accessed through [this link](https://docs.google.com/presentation/d/1sWIW90LG5TUfKConUdpF6VSR1EKdoXj0YGUECnZ-iHI/edit#slide=id.g3176c28cf20_1_0) (you may need to request access).

The slides cover the following topics:

- What is Git?
- Why use Git?
- What is a Git repository?
- What's inside the `.git` directory?
- Stages of the git workflow
- Working directory
- Staging area
- Local repository
- Remote repository (GitHub)
- Basic Git commands
- `git add`
- `git commit`
- `git push`
- `git fetch`
- `git merge`
- `git pull`

The second workshop on Code Reviews can be found [this handbook page][code-review-presentation].
2 changes: 1 addition & 1 deletion docs/software_development/Version_Control/git/quick_git.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ You can see all the aliases you have set up by running:
git config --global --get-regexp alias
```

## 7. Remove local branches that have been deleted remotely
## 6. Remove local branches that have been deleted remotely

**Problem:** You or another lab member have deleted a branch on the
remote repository, but it still shows up in your local repository.
Expand Down

0 comments on commit 2f39ee8

Please sign in to comment.