README.md in git-up-0.5.9 vs README.md in git-up-0.5.10

- old
+ new

@@ -1,42 +1,45 @@ -git-up -====== +git-up(1) -- fetch and rebase all locally-tracked remote branches +================================================================= +SYNOPSIS +-------- + `git pull` has two problems: * It merges upstream changes by default, when it's really more polite to [rebase over them](http://www.gitready.com/advanced/2009/02/11/pull-with-rebase.html), unless your collaborators enjoy a commit graph that looks like bedhead. * It only updates the branch you're currently on, which means `git push` will shout at you for being behind on branches you don't particularly care about right now. Solve them once and for all. -install +INSTALL ------- $ gem install git-up Windows support is predictably absent. Try the [Python port](https://github.com/msiemens/PyGitUp), which was started for that reason. -use +USE --- ![$ git up](http://dl.dropbox.com/u/166030/git-up/screenshot.png) -although +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. -difficulties +DIFFICULTIES ------------ ### Windows Windows support is an ongoing pain. Have a look at [this ticket](https://github.com/aanand/git-up/issues/34) if you really need it, or if you're bored. ### spawn.rb:187:in `_pspawn': Invalid command name (ArgumentError) If you're using RVM and you get this error, [read this](https://github.com/aanand/git-up/blob/master/RVM.md). -configuration +CONFIGURATION ------------- `git-up` has a few configuration options, which use git's configuration system. Each can be set either globally or per-project. To set an option globally, append the `--global` flag to `git config`, which you can run anywhere: git config --global git-up.bundler.check true