Glossary
Basic Terms
Term one is a more simple version, while term two is a more advanced explanation.
It is recommended to read both to get a good understanding of what each term is.
Repository
- A repository is the home for the source code and other related files.
- The git repository is the .git folder in your root folder and hosts all the git information that is crucial for git's features to work properly.
Branch
- Branches are different versions of your code in your repository that run in parellel to the others.
- Git branches are effectively a pointer to a snapshot of your changes.
Stage
- Stage, or tp stage means to stage your file to go to the next commit.
- Staged means that you have marked a modified file in its current version to go into your next commit snapshot.
Commit
- A commit is a version of your code that you save to be pushed from your local database to the repo.
- Commits can be thought of as snapshots along the timeline of a Git project.
Push
- How you transfer commits from your local repository to a remote repository.
- Pushing your commits to the centralized repository, comparing them, then adding them to the timeline if there is no merge conflicts that need to be satisfied.
Pull
- Pulling changes down from the centralized repository to your local repository, usally to sync the two.
- Pulling the moost recient commits and other history from the the centralized repository to your local repository.
Sync
- Git fetching, pulling, then pushing, just automated into one command.
Checkout
- Switches branches if there are no modified files present on the current branch.
- If a branch is specfied, then all changes will be carried over to the target branch, allowing it to be commited to that branch instead.
Rebase
- Changing the base of your branch from one commit to another making it appear as if you'd created your branch from a different commit.
- Doing this reorders the commit history and can break immediate merges, causing merge conflicts.
Other Terms
Terminal
A terminal, or a shell is a window that normally consists of a command prompt that allows to you interact with your pc in a command line interface.
There is a lot that can be done with a terminal, most of which won't be explained here.
No Comments