Adding removed files for a commit

Use the below command to add the removed files to a commit

git ls-files --deleted -z | xargs -0 git rm

Read More

Git Issue : Your branch and 'origin/master' have diverged - how to throw away local commits?

I have the following message in git:

# Your branch and 'origin/master' have diverged, 
# and have 3 and 8 different commits each, respectively. 
# (use "git pull" to merge the remote branch into yours) 

I would like to throw away the 3 local commits, and pull the 8 remote commits at origin/master.

git fetch origin 
git reset --hard origin/master

Read More

git pull: There is no tracking information for the current branch - BitBucket Issue

You could specify what branch you want to pull:-

git pull origin master


Or you could set it up so that your local master branch tracks github master branch as an upstream:

git branch --set-upstream-to=origin/master master
git pull


This branch tracking is set up for you automatically when you clone a repository (for the default branch only), but if you add a remote to an existing repository you have to set up the tracking yourself. Thankfully, the advice given by git makes that pretty easy to remember how to do.

Read More