Conflicts: aliases gitconfig vimrc zlogin
* Loads the Heroku production database into your development database using the preferred pgbackups + pg_restore method recommended by Heroku. * Uses same naming convention as db-* aliases. * Do not assume local development database name. * Get local database name from config/database.yml. * Make db-load-production executable.
* Appropriately rebase master into a feature branch. * Merge a feature branch into master without a merge commit. * Use 'up' for 'update'. * Use 'mm' for 'merge master'.
Encourage the developer to review the diff while crafting the commit.
Features include: * Gblame for interactive vertical split with git blame output. * Ggrep to search the work tree (or any arbitrary commit) with git grep, skipping over that which is not tracked in the repository. * :Glog loads all previous revisions of a file into the quickfix list so you can iterate over them and watch the file evolve. * :Gbrowse to open the current file on GitHub, with optional line range (try it in visual mode).
Most of us are using `bundle --binstubs` now: http://robots.thoughtbot.com/post/15346721484/use-bundlers-binstubs