Useful git commands

Lets have a look at some of the useful git commands 

Get a clone of the remote repository

• git clone <remote repository link>

Get a pull from the remote branch

• git pull <remote branch name>

Get a pull from the remote branch and rebase the remote branch with the local branch

• git pull --rebase origin <branch name>

Get all the branches from the remote repository 

• git fetch --all

Push the changes to remote

• git push origin <branch-name>
• git push origin <branch-name> --force #force push the changes

Checkout a branch

• git checkout <branch name>

Checkout a new branch from the current branch

• git checkout -b <branch name>

Add a file to commit

• git add  <filename> #Adds 1 file
• git add --all #Adds all the files including tracked and un-tracked files

Commit with a message

• git commit -m "message name"

Stash the current changes and make branch pristine

• git stash

Un-stash the last changes which were stashed ( hence make the branch dirty)

• git stash apply

Delete branch

• git push :<branchname> # delete remote branch name
• git branch -d <branchname> #delete local branch name
• git branch -D<branchname>#force delete local branch name 

Change the last commit message 

• git commit --amend -m "New commit message"

Change remote branch name 

• git branch <new-branch-name> <origin old-branch-name> #change remote branch name with the new name
• git push origin <new-branch-name> #push the new branch with the new name
• git push origin :<old-branch-name> #delete the old branch branch
• git push -D <old-branch-name>

Change local branch name

• git branch -m <old-branch-name> <new-branch-name> #If you want to rename any branch
• git branch -m <new-branch-name> #If you want to change the current branch

Reset last commit 

• git reset --hard HEAD~1
• git push origin <branch-name> --force # This step will push the reverted changes back to the remote

Reset last commit but keep the changes in local branch

• git reset HEAD~1

Rebase your current branch changes with the local master branch

• git rebase origin/master

Merge your changes with the master branch

• git merge <branch-name> --no-ff  #Creates a commit for merge and does the merge with fast-forward mechanism

Get git commit history in a compact way

• git log oneline

Git rebase merge conflict solving : Did you forget to use add ?

Sometimes when you rebase your branch with the master branch and after fixing a merge conflict you might encounter following issue

The loopy problem of git rebasing

$ git rebase –continue

Applying: loglevel equal to silent
No changes – did you forget to use ‘git add’?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.


When you have resolved this problem, run “git rebase –continue”.
If you prefer to skip this patch, run “git rebase –skip” instead.
To check out the original branch and stop rebasing, run “git rebase –abort”.

But the problem you might having is that you have already added the file using git add <yourconfilctedfilename>  And might have added several times but still Git telling you to add the file again ??

Sometimes you got to skip your problems , bro

I have encountered this issue couple of times and it turns out is a Git bug which was later fixed with Git 2.0.2 version. So anyway in this case rather than updating your git application , you can simply do ..

git rebase –skip 

and just skip the patch. It will not do any harm because the patch was empty anyway ! 

How to set Visual Studio Version With NPM

When you install NPM modules in windows environment  , some times you might ran into an error like below.

C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.Cpp.Platform.targets(64,5): error MSB8020: The build t

ools for Visual Studio 2010 (Platform Toolset = ‘v100′) cannot be found. To build using the v100 build tools, please in

stall Visual Studio 2010 build tools. Alternatively, you may upgrade to the current Visual Studio tools by selecting t

he Project menu or right-click the solution, and then selecting “Upgrade Solution…”. [C:\Users\Documents\FLIS.Client.Tests\

node_modules\karma\node_modules\socket.io\node_modules\socket.io-client\node_modules\ws\build\bufferutil.vcxproj]

As you can see the error says that it cannot find the Visual studio 2010 platform toolset. In a scenario like this you can externally specify build platform toolset to NPM like this.

–msvs-version=2013 // I am running visual studio 2013 . So…

Say For E.g If you want to install protractor with –msvs-version=2013 

npm install protractor –msvs-version=2013

Difference between $scope and $rootscope

This article is written assuming you have the basic concepts of AngularJS !

Whenever you declare a controller in angular , you automatically create a $scope . So what does a $scope mean : “$scope is an object that refers to the application model. It is an execution context for expressions. $scopes are arranged in hierarchical structure which mimic the DOM structure of the application. $scope can watch expressions and propagate events.” documentation .

In simpler terms it means that it is a way of tying an object to the DOM . If you consider the MVC model in Angular , the scope acts as a model . It is a template which hosts all the functions and the related data . 

Okay now that we have gotten some insight into the $scope , let talk about $rootscope shall we ? $rootscope is the parent (more like a root parent ) of all the $scopes you create . It is the ultimate boss . It is (almost) like the Object class of Java .It is the top most $scope of your app and it contains ng-app directive . There is only one $rootscope for each of the Angular application .