Download GitHub cheatsheet notes and more Cheat Sheet Engineering in PDF only on Docsity!
- Git is not the same as GitHub.
- GitHub makes tools that use Git.
- GitHub is the largest host of source code in the world, and has been owned by Microsoft since 2018.
- Over 70% of developers use Git!
- Developers can work together from anywhere in the world.
- Developers can see the full history of the project.
- Developers can revert to earlier versions of a project.
What is Git :-
Why Git :-
What is GitHub :-
Features of Git :-
- When a file is changed, added or deleted, it is considered modified
- You select the modified files you want to Stage
- The Staged files are Committed, which prompts Git to store a permanent snapshot of the files
- Git allows you to see the full history of every commit.
- You can revert back to any previous commit.
- Git does not store a separate copy of every file in every commit, but keeps track of changes made in each commit!
- Git is a version control system.
- Git helps you keep track of code changes.
- Git is used to collaborate on code.
- Git and GitHub are different things.
$ git config --global user.name “” $ git config --global user.email “”
Configuring git for the first time :-
Initializing Git :-
Git now knows that it should watch the folder you initiated it on. Git creates a hidden folder to keep track of changes. $ git init
Staging files/Adding files to Git repo :-
$ git add
Staging all files in a folder :-
$ git add --all $ git add - A
OR
Staged files are files that are ready to be committed to the repository you are working on. When you first add files to an empty repository, they are all untracked. To get Git to track them, you need to stage them, or add them to the staging environment.
General Git Features :-
Git Help :-
If you are having trouble remembering commands or options for commands, you can use Git help. $ git - help See all the available options for the specific command - See all possible commands - $ git help --all If you find yourself stuck in the list view, SHIFT + G to jump the end of the list, then q to exit the view.
Git Branching :-
In Git, a branch is a new/separate version of the main repository. Branches allow you to work on different parts of a project without impacting the main branch. When the work is complete, a branch can be merged with the main project. We can even switch between branches and work on different projects without them interfering with each other.
Making a new Git Branch :-
$ git branch
Checking all available Branches :-
$ git branch
Switching to other Branches :-
$ git checkout
Making a new branch and directly switching to
it :-
$ git checkout - b
Deleting a Branch :-
$ git branch - d
Merging two Branches :-
$ git merge It’s preferred to change/switch to master branch before any branch needs to be merged with it. This will merge the specified branch with our master branch.
Push local repo to GitHub :- +
Copy the url or the link of the repo that we just created. As an example, it should look like this - https://github.com/durgeshm /example.git Paste the copied url in the below git command. $ git remote add origin ‘git remote add origin ’ specifies that we are adding a remote repository, with the specified URL, as an origin to our local Git repo. Finally, pushing our master branch to the origin URL (remote repo) and set it as the default remote branch. $ git push --set-upstream origin master Go back into GitHub and see that the repository has been updated.
Pushing local repo to github after doing the above
process at least once :-
First commit all the changes. Then push all the changes to our remote origin i.e. remote repo on github. $ git push origin
Pull local repo from GitHub :-
Git pull is used to pull all changes from a remote repository into the branch we are working on. It is a combination of fetch and merge. Use it to update your local Git. $ git pull origin
Pull branch from GitHub :- +
First, check which branches we have and where are we working at the moment by ‘git branch’ command. Since we do not have the new branch on out local Git which is to be pulled from the Github. So, to see all local and remote branches, use - $ git branch - a
For viewing only remote branches :-
$ git branch - r Now, the new branch is seen in the console but it is not available on our local repo. So, let’s check it out using ‘git checkout ’. Now run ‘git pull’ to pull that branch on our local repo. We can now check the available branches using ‘git branch’.
Push branch to GitHub :-
First, let’s create a new local branch which we will be pushing to Github. Enter the command as ‘git checkout - b ’. You can check the status of the files in this current branch using ‘git status’. Commit all the uncommitted changes for all the files in this branch using ‘git commit - a - m “” ’. Now push this branch from our local repo to Github using ‘git push origin ’.
Git clone from GitHub :-
We can clone a forked repo from Github on our local repo. A clone is a full copy of a repository, including all logging and versions of files. Move back to the original repository, and click the green "Code" button to get the URL to clone. Copy the URL.
Git Undo :-
Git Revert :-
‘revert’ is the command we use when we want to take a previous commit and add it as a new commit, keeping the log intact. First thing, we need to find the point we want to return to. To do that, we need to go through the log. To avoid the very long log list, use the --oneline option which gives just one line per commit showing – i. The first seven characters of the commit hash ii. The commit message
Git Revert HEAD :-
We revert the latest commit using ‘git revert HEAD’ (revert the latest change, and then commit). By adding the option --no-edit, we can skip the commit message editor (getting the default revert message). $ git revert HEAD --no-edit
Git Revert to any commit :-
To revert to earlier commits, use ‘git revert HEAD~x’ (x being a number. 1 going back one more, 2 going back two more, etc.)
Git Reset :-
‘reset’ is the command we use when we want to move the repository back to a previous commit, discarding any changes made after that commit. First, get the seven characters of the commit hash from the log for the commit that you want to go back for. Then we reset our repository back to that specific commit using ‘git reset commithash’ (commithash being the first 7 characters of the commit hash we found in the log).
$ git reset
Git Undo Reset :-
Even though the commits are no longer showing up in the log, it is not removed from Git. If we know the commit hash, we can reset to it using ‘git reset ’.
Git Amend :-
commit --amend is used to modify the most recent commit. It combines changes in the staging environment with the latest commit, and creates a new commit. This new commit replaces the latest commit entirely. One of the simplest things you can do with --amend is to change a commit message. $ git commit --amend - m “” Using this, the previous commit is replaced with our amended one.
Git Amend Files :-
Adding files with --amend works the same way as above. Just add them to the staging environment before committing.
