<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -110,6 +110,8 @@ module Merb
         Merb::Server.kill(Merb::Config[:port], 2)
       when :kill_9
         Merb::Server.kill(Merb::Config[:port], 9)
+      when :fast_deploy
+        Merb::Server.kill(&quot;main&quot;, &quot;HUP&quot;)
       else
         Merb::Server.start(Merb::Config[:port], Merb::Config[:cluster])
       end</diff>
      <filename>lib/merb-core.rb</filename>
    </modified>
    <modified>
      <diff>@@ -271,6 +271,11 @@ module Merb
             port = &quot;main&quot; if port == &quot;all&quot;
             options[:port] = port
           end
+          
+          opts.on(&quot;--fast-deploy&quot;, &quot;Reload the code, but not your&quot; \
+            &quot;init.rb or gems&quot;) do
+              options[:action] = :fast_deploy
+          end
 
           # @todo Do we really need this flag? It seems unlikely to want to
           #   change the mutex from the command-line.</diff>
      <filename>lib/merb-core/config.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>247779ebe96100b49690581801a897636e72b36a</id>
    </parent>
  </parents>
  <author>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </author>
  <url>http://github.com/wycats/merb-core/commit/4405ac5db172a40d533b71a0a57a3233aea13435</url>
  <id>4405ac5db172a40d533b71a0a57a3233aea13435</id>
  <committed-date>2008-09-27T22:24:39-07:00</committed-date>
  <authored-date>2008-09-27T22:24:39-07:00</authored-date>
  <message>Add --fast-deploy option</message>
  <tree>55278af25b5cb51e26f3e5131585788af1b85a94</tree>
  <committer>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </committer>
</commit>
