lib/remocon/cli.rb in remocon-0.3.1 vs lib/remocon/cli.rb in remocon-0.4.0.pre.1

@@ -31,9 +31,10 @@
     def push
       execute(Remocon::Command::Push)
     end
 
     desc "pull", "Pull remote configs"
+    option :merge, type: :boolean, default: true, desc: "use the hash merge algorithm if true. default is true."
     option :prefix, type: :string, desc: "the directory name which will contain project-related files"
     option :token, type: :string, desc: "access token to your project"
     option :id, type: :string, desc: "your project id"
     option :dest, type: :string, hide: true, desc: "[Deprecated] the same with --prefix"
     def pull