bin/braid in realityforge-braid-0.7.2 vs bin/braid in realityforge-braid-0.8.0

- old
+ new

@@ -10,11 +10,11 @@ # mostly blantantly stolen from ara's punch script # main kicks ass! Main { description <<-TXT - braid is a simple tool to help track git or svn repositories inside a git repository. + braid is a simple tool to help track git repositories inside a git repository. Run 'braid commandname help' for more details. All operations will be executed in the braid/track branch. You can then merge back or cherry-pick changes. @@ -23,34 +23,23 @@ mode(:add) { description <<-TXT Add a new mirror to be tracked. * adds metadata about the mirror to .braids - * adds the git or git svn remotes to .git/config + * adds the git remotes to .git/config * fetches and merges remote code into given directory - --type defaults: - - * svn://path # => svn - * git://path # => git - * http://path/trunk # => svn - * http://path.git # => git - Name defaults: * remote/path # => path * remote/path/trunk # => path * remote/path.git # => path TXT examples <<-TXT - . braid add svn://remote/path - . braid add svn://remote/path local/dir - . braid add git://remote/path local/dir . braid add http://remote/path.git local/dir - . braid add http://remote/path --type git local/dir - . braid add svn://remote/path --branch notmaster + . braid add http://remote/path local/dir TXT mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full, :option_verbose run { @@ -132,10 +121,10 @@ } } mode(:setup) { description <<-TXT - Set up git and git-svn remotes. + Set up git remotes. TXT mixin :optional_path, :option_verbose, :option_force run {