Git & GitHub Flashcards
What is a branch?
Branch: A version of the codebase that diverges from the main branch to isolate changes for specific features, fixes, or experiments.
What is a commit?
Commit: A snapshot of your changes, saved to your local repository. Each commit is uniquely identified by a checksum.
What is the stage?
Stage: The area where Git tracks changes that are ready to be included in the next commit. Files in the staging area are prepared (staged) for the next commit.
What is a merge?
Merge: The process of integrating changes from one branch into another, typically the main branch.
What is a Pull Request?
Pull Request: A proposal to merge changes from one branch into another, often used in collaborative environments to review and discuss changes before they are merged.
What does Fork mean?
Fork: A personal copy of someone else’s project that lives on your GitHub account.
What does clone mean?
Clone: The act of downloading a repository from a remote source to your local machine.
what does “remote” mean?
Remote: A common repository that all team members use to exchange their changes.
what does “origin” mean?
Origin: The default name Git gives to the server from which you cloned.
What does “upstream” mean?
Upstream: The original repository that was cloned.
(or in the direction of the original repository that was cloned.)
what is master/main?
Master: The default branch name given to a repository when it is created. In modern practice, it is often replaced with “main.”
what is a repository?
Repository: A storage location where your project lives, containing all the files and revision history.
what is the working directory?
Working Directory: The directory (folder) on your computer where you are making changes to your project.
Staging Area
Staging Area: Also known as the “Index,” it’s an area where Git tracks changes that are ready to be committed.
Index
Index: Another name for the staging area, where Git tracks changes that are ready to be committed.
HEAD
HEAD: A reference to the last commit in the currently checked-out branch.
checkout
Checkout: The action of switching from one branch to another or to a specific commit.
Push
Push: The action of sending your commits to a remote repository.
Pull
Pull: The action of fetching changes from a remote repository and merging them into your current branch.
Fetch
Fetch: The action of retrieving updates from a remote repository without merging them into your current branch.
How do you Create a remote repository, create a local repository and then connect them?
remote repo:
1. go to github.com
2. click on the + (plus) sign
3. It will give you an option to make a new repository
4. It will spit out a HTTP or SSH string that you will use to connect the two repos
local repo:
1.In terminal, go to the folder where you want to create your new repo.
2. type: git init nameOfNewRepo
– this will create a new folder with the name of your repo and inside that folder will be another folder called .git which will contain all the necessary files for your repo. – so it creates a folder to hold everything, you don’t need to do that beforehand
– also, give it the exact same name you gave the remote repo on Github
Connect local and remote repos:
1. Go to Github and copy the HTTP string that was generated when you created the remote repo. (it might be under the CODE button)
2. In the terminal navigate to the folder of your local repo
3. type this command:
git remote add origin HTTPstringOfRemotRepo
4. If you’re not already authenticated, it will ask you for auth - either by password or personal access token (PAT). I used PAT and it lasts for 30 days.
5. to get a PAT click on your avatar pic, go to settings, click on developer settings (bottom of left side bar), personal access tokens (left side bar) and then “tokens classic”
May want to set up SSH in the future.
what does the following terminal prompt do?
cd..
go up one directory (folder)
so if you’re in
C:/users/stuck you’ll go up one to
C:/users
What does this command prompt do?
cd\
It takes you to the top of the directory tree
so if you’re in C:\user\stuck\blah
it will take you to
C:\
How do you move down into an already established directory?
cd plus entire path name
OR
cd nameOfFolder (if folder is just the next step down)
If you know the path to the directory you want, you can type it in using backslashes. For example, this would get you to the desktop
cd C:\Users\stuck\Desktop
if your at desktop ^^ and you want to get into the Bubba folder which is inside desktop you can type
cd Bubba
and that will put you inside the Bubba folder
How do you change drives using the terminal/command prompt?
To access another drive, type the drive’s letter, followed by :
For instance, if you wanted to change the drive from C: to D:, you should type: d:
From the terminal, how do you see what files and folders are in the current directory?
DIR
from the terminal, how do you make a new directory?
mkdir nameOfDirectory
so if I wanted to make a folder called “bubba” I would type
mkdir bubba
How do you pull down changes from a remote repository into your local repository?
In the terminal:
1. make sure you’re in the directory of you local repo
2. type: git pull origin main
how do you check the status of the current branch?
git status
it will show the status of the current branch, including any changes that have been made to the files in the repository. It provides information about which files have been modified, which files have been staged, and which files are untracked.
How do you add files to the staging area?
git add fileName
git add . – I believe this adds everything to the staging area
How do you commit changes to the current branch?
git commit -m “Commit message”
How do you push your changes to a remote repository?
git push origin main
List all the typical steps you would take when making a commit and pushing to the remote repo?
- After making your changes, save the file in VSCode – CTRL + S
- git status – this will show you in which files there are changes
- git add . OR git add fileName – this will add your changes to the staging area
- git commit -m “commitMessage” – this will commit those changes
- git push origin main – this will push your newly committed changes to the remote repository.
