lib/pivotal-github/story_merge.rb in pivotal-github-0.6.6 vs lib/pivotal-github/story_merge.rb in pivotal-github-0.6.7

@@ -8,13 +8,10 @@
       opts.banner = "Usage: git story-merge [options]"
       opts.on("-d", "--development BRANCH",
               "development branch (defaults to master)") do |opt|
         self.options.development = opt
       end
-      # I wanted to use '-f' and '--force', but those interact
-      # badly with the default `git merge` options.
-      opts.on("-r", "--run", 
-              "run without marking story finished") do |opt|
+      opts.on("-f", "--force", "override unfinished story warning") do |opt|
         self.options.run = opt
       end
       opts.on_tail("-h", "--help", "this usage guide") do
         puts opts.to_s; exit 0
       end
\ No newline at end of file