Git

New Clone

• service puppet stop; service puppetmaster stop; rm -fr /etc/puppet; http_proxy=proxy.traderonline.com:80 git clone http://git.dhsint.com/puppetconf-tol.git /etc/puppet; cd /etc/puppet; git config --global http.proxy proxy.traderonline.com:80; service puppet start
• cd /etc/puppet; git submodule init; git submodule update

Creating a new Branch

• on dssysdev02
  • git clone --bare http://git.ops.traderonline.com/centos-netinstall-dws.git /path/to/centos-netinstall-dws.git
  • cd /path/to/centos-netinstall-dws.git
  • git remote rm origin
  • cd /path/to/centos-netinstall-dws.git; git update-server-info; mv hooks/post-update.sample hooks/post-update
• on laptop
  • git clone ssh://root@git.dhsint.com/path/to/centos-netinstall-dws.git
  • git checkout -b set-default-options

Pushing new branch after edits

• git add <edited file>
• git commit
• git push origin set-default-options:set-default-options

Overwriting updates to a branch

• git add <edited file>
• git commit --ammend
• git push origin +set-default-options:set-default-options

Merge My Edits

• git checkout master
• git merge --no-ff <branch>
• git push origin master:master

Once that is complete, delete the branch

• git push origin :<branch>
• git branch -d <branch>

Merging Someone Else's Edits

• git rev-parse HEAD
• git merge-base HEAD tol/<branch>
• git merge --no-ff tol/<branch>
• git push origin master:master