Bootstraping a new git repo

Bootstraping a new git repo without fork

sudo mkdir -p ~/src/some_project  
git clone ~/src/some_project  
cd /src/some_project  
git remote rm origin  
git remote add origin <the location of my new git repository>  
git push -u origin master  

Upgrade your project from the public scripts-to-rule-them-all

cd ~/src/some_project  
git remote add upstream  

Then we're going to fetch the stuff from the upstream repository:

git fetch upstream

Now we're going to merge the updated repository with our own:

git checkout master
git merge upstream/master

Now deal with conflicts in

git mergetool