Skip to content

Commit

Permalink
Merge remote-tracking branch 'nathanaelkane/patch-1'
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
  • Loading branch information
aanand committed Sep 17, 2012
2 parents 72f8c5f + 65b38ab commit c5df085
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -36,7 +36,7 @@ If you're even lazier, you can tell `git-up` to run `bundle install` for you if

### `git-up.fetch.prune [true|false]`

By default, `git-up` will append the `--prune` flag to the `git fetch` command if your git version supports it (1.6.6 or greater), telling it to [delete any branches which no longer exist on the remote](http://linux.die.net/man/1/git-fetch). Set this option to `false` to disable it.
By default, `git-up` will append the `--prune` flag to the `git fetch` command if your git version supports it (1.6.6 or greater), telling it to [remove any remote tracking branches which no longer exist on the remote](http://linux.die.net/man/1/git-fetch). Set this option to `false` to disable it.

### `git-up.fetch.all [true|false]`

Expand Down

0 comments on commit c5df085

Please sign in to comment.