git remote add upstream URL
git fetch upstream
git merge upstream/master

htpasswd -m -c /home/www/git/.htpasswd <username>