David DeSandro 3b0d8b37e7 Merge branch 'master' into ignore ...

Conflicts:
	lib/core/package.js

2013-01-30 11:03:06 -05:00

..

commands

Fix tags being added to non-repo packages in update, fixes #197.

2013-01-29 16:12:39 +00:00

core

Merge branch 'master' into ignore

2013-01-30 11:03:06 -05:00

util

Print a good detail message when a conflict occurs and ways to resolve it, #214.

2013-01-29 14:42:46 +00:00

index.js

add config to public api

2012-11-06 21:47:56 -05:00