Difference between revisions of "Git"
Jump to navigation
Jump to search
(Created page with '=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/pup…') |
|||
| Line 2: | Line 2: | ||
* 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 | * 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 | * 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 | ||
Revision as of 07:00, 23 June 2011
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