Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Stop using "git pull". Be polite.

branch: master

Fetching latest commit…

Octocat-spinner-32-eaf2f5

Cannot retrieve the latest commit at this time

Octocat-spinner-32 bin
Octocat-spinner-32 lib
Octocat-spinner-32 test
Octocat-spinner-32 .document
Octocat-spinner-32 .gitignore
Octocat-spinner-32 Gemfile
Octocat-spinner-32 Gemfile.lock
Octocat-spinner-32 LICENSE
Octocat-spinner-32 README.md
Octocat-spinner-32 Rakefile
Octocat-spinner-32 git-up.gemspec
README.md

git-up

So git pull merges by default, when it should really rebase. You can ask it to rebase instead, but it still won't touch anything other than the currently checked-out branch. If you're tracking a bunch of remote branches, you'll get non-fast-forward complaints next time you push.

Solve it once and for all:

gem install git-up

although

git-up might mess up your branches, or set your chest hair on fire, or be racist to your cat, I don't know. It works for me.

configuration

git-up can check your app for any new bundled gems and suggest a bundle install if necessary.

It slows the process down slightly, and is therefore enabled by setting git-up.bundler.check to true in your git config, either globally or per-project. To set it globally, run this command anywhere:

git config --global git-up.bundler.check true

To set it within a project, run this command inside that project's directory:

git config git-up.bundler.check true

Replace 'true' with 'false' to disable checking.

If you're even lazier, you can tell git-up to run bundle install for you if it finds missing gems. Simply set git-up.bundler.autoinstall to true, in the same manner. As above, it works globally or per-project, but make sure git-up.bundler.check is also set to true or it won't do anything.

Something went wrong with that request. Please try again.