#user nobody; | |
worker_processes 1; | |
error_log logs/error.log; | |
#error_log logs/error.log notice; | |
#error_log logs/error.log info; | |
#pid logs/nginx.pid; | |
# having env.sh in /etc/profile.d allows access to all users...be careful | |
*/5 * * * * . /etc/profile.d/env.sh && cd /opt/path && /home/ubuntu/.rbenv/shims/bundle exec rake task |
<?php | |
/* | |
By Marco Arment <me@marco.org>. | |
This code is released in the public domain. | |
THERE IS ABSOLUTELY NO WARRANTY. | |
Usage example: | |
// In a registration or password-change form: |
#Submodules
Here is how we do it at Our Office
When you clone your working repos (api, app, www), you'll have an empty Modules
directory. The working repo will contain a pointer to the hash of the last Modules
repo committed. All that needs to be done from your working repo directory is:
$ git subumodule init
#The Big Headache.
A common error we get when attempting to run rake -T
after a git pull
is:
rake aborted!
cannot load such file -- some/gem_file
/Users/todgru/.rvm/gems/ruby-1.9.3-p194/gems/vlad-2.3.0/lib/vlad.rb:3:in `require'
/Users/todgru/.rvm/gems/ruby-1.9.3-p194/gems/vlad-2.3.0/lib/vlad.rb:3:in `<top (required)>'
/Users/todgru/.rvm/gems/ruby-1.9.3-p194/gems/bundler-1.2.2/lib/bundler/runtime.rb:68:in `require'
/Users/todgru/.rvm/gems/ruby-1.9.3-p194/gems/bundler-1.2.2/lib/bundler/runtime.rb:68:in `block (2 levels) in require'
#Oops, I merged untested changes to master!
You've made changes to master, commited and push up to your repo. Git is flexible enough that you can dig yourself out rather easily. Here are two of many options to get back to a safe place.
- Option 1, Branch out and keep your changes.
- Option 2, Reset the branch and lose changes.
The final step in both of these options is $ git push --force origin master
.
##Option 1: Branch Out
#How to use Pull Request
From https://help.github.com/articles/using-pull-requests
After you have branched from the mainline, made changes, commit to your branch and push your branch to the Github repo.
In the Github repo, select your branch from the drop down.
Click pull request
......
perc=$(df -h |grep /dev/xvda1| awk {'print