Autogenerated HTML docs for v1.5.6.2-291-g7eef3

diff --git a/git-apply.html b/git-apply.html
index 13ba3221bef0cbb639b609a4b1527f1b853b9058..12bdbc497d40bb3e26a61dd12c54455d8aae9052 100644 (file)
--- a/git-apply.html
+++ b/git-apply.html
@@ -326,7 +326,7 @@ git-apply(1) Manual Page
           [--allow-binary-replacement | --binary] [--reject] [-z]\r
           [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]\r
           [--whitespace=<nowarn|warn|fix|error|error-all>]\r
-          [--exclude=PATH] [--verbose] [&lt;patch&gt;&#8230;]</div></div>\r
+          [--exclude=PATH] [--directory=&lt;root&gt;] [--verbose] [&lt;patch&gt;&#8230;]</div></div>\r
 </div>\r
 <h2 id="_description">DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -628,6 +628,18 @@ behavior:</p></div>
         adjusting the hunk headers appropriately).\r
 </p>\r
 </dd>\r
+<dt>\r
+--directory=&lt;root&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Prepend &lt;root&gt; to all filenames.  If a "-p" argument was passed, too,\r
+        it is applied before prepending the new root.\r
+</p>\r
+<div class="para"><p>For example, a patch that talks about updating <tt>a/git-gui.sh</tt> to <tt>b/git-gui.sh</tt>\r
+can be applied to the file in the working tree <tt>modules/git-gui/git-gui.sh</tt> by\r
+running <tt>git apply --directory=modules/git-gui</tt>.</p></div>\r
+</dd>\r
 </dl></div>\r
 </div>\r
 <h2 id="_configuration">Configuration</h2>\r
@@ -671,7 +683,7 @@ subdirectory is checked and (if possible) updated.</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-06 05:16:34 UTC\r
+Last updated 2008-07-10 02:30:35 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-apply.txt b/git-apply.txt
index e9f724b2fa35cf18978dbcba9dcef7ed28a1b19d..feb51f124ac8a806e65d41f6274c58de64d2991f 100644 (file)
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -14,7 +14,7 @@ SYNOPSIS
          [--allow-binary-replacement | --binary] [--reject] [-z]
          [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
          [--whitespace=<nowarn|warn|fix|error|error-all>]
-         [--exclude=PATH] [--verbose] [<patch>...]
+         [--exclude=PATH] [--directory=<root>] [--verbose] [<patch>...]
 
 DESCRIPTION
 -----------
@@ -182,6 +182,14 @@ behavior:
        by inspecting the patch (e.g. after editing the patch without
        adjusting the hunk headers appropriately).
 
+--directory=<root>::
+       Prepend <root> to all filenames.  If a "-p" argument was passed, too,
+       it is applied before prepending the new root.
++
+For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh`
+can be applied to the file in the working tree `modules/git-gui/git-gui.sh` by
+running `git apply --directory=modules/git-gui`.
+
 Configuration
 -------------