Intro We just can’t imagine our life without and . git Github If you’re a developer, it is a must to understand Git. . Git tracks all the changes you make to your files so that you have a record of all the changes that have been completed. In this read, you will work on Git practically and will gain the basic understanding of Git. Git is the most commonly used version control system Getting consistent with the work is the only way to achieve glory. For consistency, we need to work, work, and do more work and for that sometimes even we need therapy. For me,  my therapy is listening to her songs: Installing Git For MacOS $ brew install git For Linux Debian/Ubuntu $ apt-get install git Fedora $ yum install git For other Linux distributions, you can click here How Git Works It starts with the Initialization. We need to initialize our working directory as ‘Git Directory’ with the command . Once we have initialized the git repository we can add our files to the staging area. git init Staging is nothing but tracking files from the working directory. We can add untracked files to staging with the command or In oder to add all the files from that particular directory. git add <filename> git add . We can’t commit untracked files from the working directory until we don’t stage them. and unless Commit is used to save your changes to the local repository. Every time you save that file, all the changes made are tracked. The command takes the snapshot recording the staged changes. Git commit We can commit a file by the following command . git commit -m "<message>" should be related to the changes made in that particular file at the time of staging. message Once all the files are staged and committed, then we can push the local repository to the code hosting platform like Github for collaborations and to avoid losing all our program files due to any kind of failure of our local machine. Git Setup So now that we have installed git on our machine, let's get started with git with our identity. Setup git with the command. git config First, we will add by the following command. username $ git config --global user.name "JohnDoe" Then we will add our email address by the following command. $ git config --global user.email "johndoe@example.com" That’s it. We have set up our Git. Let’s work on git practically. Let’s do it Practically Open terminal and make a new directory with following command: $ mkdir gitEssentials Now navigate to the directory: $ cd gitEssentials/ Add some files to the directory: $ touch index.js server.js index.html main.css Now check the created files: $ ls Initialize the working directory with command. git init $ git init Now add some lines to your index.js file so that we can add them to the staging area. $ echo "console.log('Git Essentials');" >> index.js command is used to check the current status of our working directory. git status As we can see there are no commits yet and we have 4 untracked files. Now with the command , we will track/stage the files. git add $ git add . Let’s check what has to show now: git status So we have staged all the files. Let’s create another file and name it . to_Be_Deleted.js $ touch to_Be_Deleted.js Now check the status with . git status This is what we get now. It shows that we have 1 untracked file. Let stage the untracked file using command. git add $ git add . After adding, check the status using command. git status We have successfully staged our newly created file . to_Be_Deleted.js Now we will learn how to unstage a file. For unstaging a file we will use command. git rm --cached <file> Let’s unstage the file. to_Be_Deleted.js $ git rm --cached to_Be_Deleted.js That’s it, we have unstaged the file successfully. Let’s check it using command. git status Yepp! We have unstaged the file. Delete the file to_Be_Deleted.js $ rm to_Be_Deleted.js Now we will be working on command. git commit Let’s commit our staged files. $ git commit -m "console.log added to index.js file" Let’s check the status of our working tree after committing files. So as we have committed all the files we get the message . That's cool. nothing to commit, working tree clean Let’s check the logs using command. This command is super handy. git log $ git log It shows the complete commit history with commit id, author, time and commit message. Using command we can track the changes made on that particular commit using the commit id. git show $ git show 67c737e925fd76918444494f752a65fce5d6a55e With the help of command, we can track all the changes commited with that particular commit. git show <commitId> Now if we edit our files, how do we amend the commit. Let’s work on it. First of all we will be editing our file. index.js $ echo "const age = 18;" >> index.js Now we will check the status of our working tree. So now we are getting modified message for file which is unstaged. index.js Now we will check what changes has been added to the file using command. git diff $ git diff So the changes are shown with sign as we can see it over here . + +const age = 18 Let’s track the file with the command and then commit it with a different message. git add For changing the commit message we can use the command: git commit --amend -m "<message>" $ git commit --amend -m "added const age" Now if we go for command, we will get the following data. git log As you can see the message got changed to . added const age Now we will edit some other files. Add the following command to edit your file: main.css $ echo "body {}" >> main.css Now stage the file using command: git add $ git add . Now commit the file: $ git commit -m "added body {} to main.css" We have committed the file successfully.
Now check the logs using command. git log $ git log Yep now we are having two commits in our git logs. GitHub Github is a code hosting platform. It is web-based platform used for version-control. It becomes super handy when it comes to collaborating on projects and working with other people. Let's add a new repository on GitHub which is really easy. Once you create a new repository you go to this page. And as we already have an existing repository we will copy lines from . …or push an existing repository from the command line $ git remote add origin git@github.com:SwamiSankalp/gitEssentials.git This gives the origin the path to store our local repository to the GitHub repository. $ git branch -M main Branches are really important in , we will talk about it in a later part. For now just follow. Git $ git push -u origin main This command pushes our local repository to the GitHub repository. We have successfully added our local repository to GitHub. Once done, you can refresh your GitHub page, you will find your local repo over there: Branches in Git Branches in Git are nothing but an independent line of development, ie; When there are multiple developers working on the same project everyone can have their own branches which will keep the code base safe. Git branches come to the rescue at many different places during the development of a project. There is one default branch. main You can add your committed files to your own branches and can submit it to your senior dev for review. If it gets approval then your branch is merged with the default branch. main $ git branch As we can see we are having only one branch that is by default branch. main command is used for adding a new branch. git branch <branchName> $ git branch feature-xyz Now you can check branches by the command: git branch We have added a new branch successfully. You can swithch branches using command. git checkout <branchName> For pushing your newly added branch to github you can use command. git push -u origin <branchName> As you can see we have successfully pushed the branch to github.
We can merge both the branches using command. git merge Now we will be merging our branches. $ git merge feature-xyz If some changes are made directly on GitHub repository and if we want that code on our local machine, we can use command. git pull Let's change some code on GitHub repo and let’s pull it to our local machine. We will add file on GitHub repo. Readme file is used for adding some basic instructions for that particular repository. readme Go to Github and click on button. add a README Edit the file the way you want and click on . commit new file Now go to your terminal and check for git logs. You will find 1 less git commit than your GitHub commits. then with the help of command you can pull the changes to your local machine. Yepp we have successfully pulled the changes from the GitHub repo to our local git repository. git pull Some More Commands Using the command to set the preferred editor when triggering the command. git config --global core.editor vim git commit -a Using the to present all defined config lists. git config --list Using the command to present defined remote Git server URL lists. git remote Using the command to present current remote name to be the Git server URL. git remote get-url remote_url_name Conclusion I hope now we have some solid knowledge about Git and GitHub and have gained good practical skills for efficient use. Let me know in the comment section if you have any doubts or feedback. Thank You Thanks for reading, keep learning, peace and farewell! Also Yeah! Get intoxicated by listening to her:

Initialized

Super

Read My Stories

Too Long; Didn't Read

Publish Your First Brand Story for FREE. Click Here.

Git it Right or Git Gone

Too Long; Didn't Read

Companies Mentioned

@sankalp1122

RELATED STORIES