🏮 Git is a distributed version control system to manage source code history.
🏮 It is a method that we programmers use to save, record and keep track of changes in our code. Basically, we store a version of the code at any given instance, such that if we ever made changes to it, we can always know where those changes were made. Not only can we know the prior changes, we can in fact trace back the history of changes all the way back to the very first initial version of our code. (This of course just comes at the cost of remembering to commit your changes over and over and over again with every time you edit the code).
🏮 The repository is the project directory, a container or folder for the project you want to track using git.
git --version🏮️ When we make changes to files, Git wants to know who's making these changes so they can keep track of them.
🎯️ Git Config For Just Directory.
git config user.name YourNamegit config user.email "Example@example.com"🎯️ Git Config For Any Directory For User
git config --global user.name YourNamegit config --global user.email "Example@example.com"If Name or Email it contain Space, Enter Name and Email In " "
🏮️ The Git Staging Environment can be thought of as an additional safety cover, as it can be used to create a very good commit, and make a comparison with the last commit.
🎯️ Add all changes in the current directory to the staging environment.
git add .🎯️ Add all changes in all directories to the staging environment.
git add --all🎯️ Add all files ending in .py staging environment.
git add *.py🎯️ Add all files starting with main staging environment.
git add main.*🎯️ Adding a chunk of the changes to the staging environment.
git add -p🏮️ Git Commit can be thought of as a save point, a point you can refer to if something goes wrong in the future, or if you want to know how the code was at a particular moment in time.
🎯️ Add all changes to the staging environment and create a commitment.
git commit -a -m "Commit Message"🎯️ Add all changes to the staging environment and create a commitment.
git commit -am "Commit Message"🎯️ Create a commitment for changes that have been added to the staging environment.
git commit -m "Commit Message"🎯️ Create a commitment for changes that have been added to the staging environment on nano or vim.
git commitThe commitment message should be a well-constrcuted, descriptive message, and the message length should not exceed 80 characters.
🏮️ If you are having trouble remembering commands or command options, you can use Git help.
🎯️ See all possible commands in git.
git help --all🎯️ See all the available options for the specific command.
git command --help🏮️ When we start in Git, there is a branch that is created with the initialization of the repository, typically called "master" or "main". It is the primary production branch in most cases, which motivates most users to create other branches for development purposes. This branching serves to maintain the main branch, and perhaps test or debug the code without affecting it.
🎯️ Create branch from current branch
git branch branch-name🎯️ Create branch from a previous commit.
git branch branch_name commit-hash or HEAD~3🎯️ Create branch from current branch using checkout.
git checkout -b branch-name🎯️ Create branch from a previous commit using checkout.
git checkout -b branch_name commit-hash or HEAD~3'HEAD~number' this means a number of commits after current commit, (e.g HEAD~4 means the 3 commits after current commit).
🏮️ When using Git with multiple branches, you may get lost and need to check which branch you're currently in.
🎯️ can see the current branch with a '*' beside the branch name.
git branch🏮️ Sometimes you may want to change the name of a branch to a another name.
🎯️ Change current branch name.
git branch -M new-name🎯️ Change different branch from current branch.
git branch -M old-name new-name🏮️ When you want to switch from one branch to another branch.
🎯️ Switch from current branch using checkout.
git checkout branch_name🎯️ Switch from current branch using switch.
git switch branch_name🏮️ When you have finished working on a branch, you may want to merge the changes into the master branch.
🎯️ Merge a branch into the current branch:
git merge "The name of the branch to be merged"🎯️ Merge Conflict: Merge conflicts occur when competing changes are made to the same line of a file, or when one person edits a file and another person deletes the same file.
$ git merge <branch-name>
Auto-merging <file-name>
CONFLICT (content): Merge conflict in <file-name>
Automatic merge failed; fix conflicts and then commit the result.🎯️ So we need to fix that conflict. Open the file in our editor:
<Some Text>
<<<<<<< HEAD
Changes in the current branch.
=======
Changes from the branch to be merged.
>>>>>>> <The name of the branch to be merged>
<Some Text>- You must make sure that you are in the branch you want to merge in.
- HEAD is meant for the current branch.
- In Git workflow, there are two long-lived branches: master or main and development branches, and the branches that remain
short-lived, such as features and bugs branches. Any branch is merged into the development branch, then after making sure
everything is working well, it's merged into the master or main branch.
- You can use merge to update your local branch when there are updates in the (master, main) branch in the remote repository.
You bring the work into the remote repository to the (master, main) branch in your repository using pull or fetch, then merge your
(master, main) into the branch you are working on.
🏮️ Git clone is used to copy or clone a different repository in your local machine.
git clone <url>git clone https://github.com/BlackHeart-Dev/try-git.git🏮️ Git remote is used to refer to a remote repository or your central repository, (e.g when you want to add a remote repository as your origin).
git remote add <alias> <url>git remote add origin https://github.com/BlackHeart-Dev/try-git.git - Git clone is used to copy or clone a different repository in your local machine.
- Git remote is used to refer to a remote repository or your central repository,
e.g: When you want to add a remote repository as your origin.
- Git clone creates a new git repository by copying an existing one located at the URI you specify.
- Git remote add just creates an entry in your git config that specifies a name for a particular URL.
You must have an existing git repo to use this.
- Git clone will physically download the files into your computer, and take actual space from your computer.
- Git remote won't take local storage space. It's more like a pointer.
It just gets a snapshot of what branches are available and their git commit history.
It doesn't contain the actual files/folders of the project.
*from Stackoverflow.
- origin is alias for remote repository, It is used to refer to the remote repository instead of
using the URL every time you want to pull or push or fetch.
🏮️ The git pull command is used to fetch and download content from a remote repository and immediately update the local repository to match that content. Merging remote upstream changes into your local repository is a common task in Git-based collaboration work flows. The git pull command is actually a combination of two other commands, git fetch followed by git merge. In the first stage of operation git pull will execute a git fetch scoped to the local branch that HEAD is pointed at. Once the content is downloaded, git pull will enter a merge workflow. A new merge commit will be created and HEAD updated to point to the new commit.
git pull --set-upstream <remote> <branch>or
git pull -u <remote> <branch>git pull --set-upstream origin xz-y-10.2or
git pull -u origin xz-y-10.2🏮️ The git fetch command downloads commits, files, and references from a remote repository into your local repo. Fetching is what you do when you want to see what everybody else has been working on. It’s similar to svn update in that it lets you see how the central history has progressed, but it doesn’t force you to actually merge the changes into your repository. Git isolates fetched content from existing local content; it has absolutely no effect on your local development work. Fetched content has to be explicitly checked out using the git checkout command. This makes fetching a safe way to review commits before integrating them with your local repository.
git fetch <remote-repo> git fetch https://github.com/BlackHeart-Dev/try-git.git or
git fetch origin- Git fetch really only downloads new data from a remote repository - but it doesn't integrate any of this new data into your working files.
Fetch is great for getting a fresh view on all the things that happened in a remote repository. Due to its harmless nature,
you can rest assured; fetch will never manipulate, destroy, or screw anything up. This means you can never fetch often enough.
- Git pull, in contrast, is used with a different goal in mind: to update your current HEAD branch with the latest changes from the remote server.
This means that pull not only downloads new data; it also directly integrates it into your current working copy files.
This has a couple of consequences:
> Since "git pull" tries to merge remote changes with your local ones, a so-called "merge conflict" can occur.
> Like for many other actions, it's highly recommended to start a "git pull" only with a clean working copy.
This means that you should not have any uncommitted local changes before you pull.
Use Git's Stash feature to save your local changes temporarily.
🏮️ The git push command is used to upload local repository content to a remote repository. Pushing is how you transfer commits from your local repository to a remote repo. It's the counterpart to git fetch, but whereas fetching imports commits to local branches, pushing exports commits to remote branches. Remote branches are configured using the git remote command. Pushing has the potential to overwrite changes, caution should be taken when pushing.
git push <url>git push https://github.com/BlackHeart-Dev/try-git.gitor
git push origin🏮️ Branches are perhaps one of the best features of Git, but what Git often does is provide the tool but not tell you how to use it. It leaves you and your team the freedom to use the tool, and when it comes to branches, there are two frquently-used strategies; the Git workflow and the GitHub workflow.
In the Git workflow, there are: two long-lived branches (master & development), and short-lived branches, like for testing features and debugging branches. Any short-lived branch is merged into the development branch, then after making sure that it's properly functioning, it is merged into the master branch.
In the Github workflow there are only short-lived branches for feature-testing and bugs, and the master branch.
| Github | Git |
|---|---|
| Github is a service | Git is a software |
| Github is a graphical user interface | Git is a command-line tool |
| Github is a hosted on the web for git | Git is installed locally on your local machine |
| Github is maintained by Microsoft | Git is maintained by Linux |
| Github is focused on the centralized code hosting | Git is focused on version control and code sharing |
| Github is a hosting service for git repositories | Git is a distributed version control system to manage source code history |
- By DataScienceDojo.