Git

From KeegansWiki
Revision as of 08:00, 23 June 2011 by Keegan (talk | contribs)
Jump to navigation Jump to search

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 http.proxy proxy.traderonline.com:80; service puppet start
  • cd /etc/puppet; git submodule init; git submodule update

Merging

  • git rev-parse HEAD
  • git merge-base HEAD tol/sendmail
  • git merge --no-ff tol/sendmail
  • git push origin master:master
Retrieved from "http://wiki.keeganm.com/index.php?title=Git&oldid=141"