cd /etc/puppet
ssh git@science
git init
git remote add origin git@science.cloud5.harker.com:puppet.git
git config branch.master.remote origin
git config branch.master.merge refs/heads/master
git symbolic-ref -m "linking HEAD to master" HEAD refs/heads/master
git add mainifests/nodes.pp mainifests/site.pp mainifests/ templates.pp
git add modules/ntp modules/ssh
git add *.conf
git commit
cd env/dev/
git clone git@science.cloud5.harker.com:puppet.git
git remote add prod /etc/puppet
git remote -v
cd ../testing/
git clone git@science.cloud5.harker.com:puppet.git
git remote add prod /etc/puppet
git remote add dev /etc/puppet/env/dev
git remote -v
git push origin master:master
git push origin master
git fetch origin
git checkout master
git merge origin/master
git merge
git push origin master:master
git log
git merge --help
git merge HEAD
man git-mergetool
git merge origin/master
git log
git cat-file commit 65f0037b
git fsck
git fsck --full
git reflog expire --expire=now --all
git gc --prune=now
git fsck
git remote show origin
git remote update
git branch -a
# create new branch based on "master" branch
git checkout -tb operator/test origin/master
# you may need to commit changes first to this new branch
# also works: git push --all
git push origin operator/test
# pull a new branch from origin
git branch
git pull
git checkout operator/test
# check for new branch
git branch
# make changes on local copy and push back to master
git pull origin operator/test
git checkout operator/test
# make changes
git add [changes]
gitc
git push origin operator/test
# delete a branch
# show all branches
gitb --all
# you may need to
git push origin [branch]
# delete local branch
git branch -d operator/test
# delete branch on master
git push origin --delete operator/test
# also try
git push origin :bad/branch/name
# merge branch
# switch to branch master
git checkout master
# merge changes in branch operator/test with master
git merge operator/test
# push changes to origin
git push origin master
# restore a single file
git checkout -- [file1 file2 file3]