<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <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>9d0f3671aaa57a5e897af8b5768fd378642ec41c</id>
    </parent>
    <parent>
      <id>4405ac5db172a40d533b71a0a57a3233aea13435</id>
    </parent>
  </parents>
  <author>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </author>
  <url>http://github.com/wycats/merb-core/commit/9e20155c58a88fd64721176b4979c52dfbf5b495</url>
  <id>9e20155c58a88fd64721176b4979c52dfbf5b495</id>
  <committed-date>2008-09-27T22:25:06-07:00</committed-date>
  <authored-date>2008-09-27T22:25:06-07:00</authored-date>
  <message>Merge branch 'forking_bootloader' into forking_runner</message>
  <tree>dfbce69132e643e821e1d1f2194d8ba3f76787cc</tree>
  <committer>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </committer>
</commit>
