Autogenerated HTML docs for v1.5.3.2-99-ge4b2

diff --git a/git-apply.html b/git-apply.html
index a26adc3f7c15737325d50e1f4f17cff5de508e5f..06334935054e46b11945fd1494c6c64297eecb30 100644 (file)
--- a/git-apply.html
+++ b/git-apply.html
@@ -274,7 +274,7 @@ git-apply(1) Manual Page
 <div class="sectionbody">\r
 <div class="verseblock">\r
 <div class="content"><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index]\r
-          [--apply] [--no-add] [--index-info] [-R | --reverse]\r
+          [--apply] [--no-add] [--build-fake-ancestor &lt;file&gt;] [-R | --reverse]\r
           [--allow-binary-replacement | --binary] [--reject] [-z]\r
           [-pNUM] [-CNUM] [--inaccurate-eof] [--cached]\r
           [--whitespace=&lt;nowarn|warn|error|error-all|strip&gt;]\r
@@ -364,16 +364,18 @@ and a work tree.</p>
 </p>\r
 </dd>\r
 <dt>\r
---index-info\r
+--build-fake-ancestor &lt;file&gt;\r
 </dt>\r
 <dd>\r
 <p>\r
         Newer git-diff output has embedded <em>index information</em>\r
         for each blob to help identify the original version that\r
         the patch applies to.  When this flag is given, and if\r
-        the original version of the blob is available locally,\r
-        outputs information about them to the standard output.\r
+        the original versions of the blobs is available locally,\r
+        builds a temporary index containing those blobs.\r
 </p>\r
+<p>When a pure mode change is encountered (which has no index information),\r
+the information is read from the current index instead.</p>\r
 </dd>\r
 <dt>\r
 -R, --reverse\r
@@ -597,7 +599,7 @@ subdirectory is checked and (if possible) updated.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Aug-2007 04:58:55 UTC\r
+Last updated 24-Sep-2007 07:36:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-apply.txt b/git-apply.txt
index 4c7e3a2f7f5d542cd95059430f53143bba59fc7f..c1c54bfe0b7d2c1b133e245a3a963caa0b7afb8c 100644 (file)
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git-apply' [--stat] [--numstat] [--summary] [--check] [--index]
-         [--apply] [--no-add] [--index-info] [-R | --reverse]
+         [--apply] [--no-add] [--build-fake-ancestor <file>] [-R | --reverse]
          [--allow-binary-replacement | --binary] [--reject] [-z]
          [-pNUM] [-CNUM] [--inaccurate-eof] [--cached]
          [--whitespace=<nowarn|warn|error|error-all|strip>]
@@ -63,12 +63,15 @@ OPTIONS
        cached data, apply the patch, and store the result in the index,
        without using the working tree. This implies '--index'.
 
---index-info::
+--build-fake-ancestor <file>::
        Newer git-diff output has embedded 'index information'
        for each blob to help identify the original version that
        the patch applies to.  When this flag is given, and if
-       the original version of the blob is available locally,
-       outputs information about them to the standard output.
+       the original versions of the blobs is available locally,
+       builds a temporary index containing those blobs.
++
+When a pure mode change is encountered (which has no index information),
+the information is read from the current index instead.
 
 -R, --reverse::
        Apply the patch in reverse.

diff --git a/hooks.html b/hooks.html
index 28cd7d6da05cc4a9d876587a0c6270e29d97527a..4501dcfa05175bb3dde5486479b881b47cc546ad 100644 (file)
--- a/hooks.html
+++ b/hooks.html
@@ -334,6 +334,17 @@ parameter, and is invoked after a commit is made.</p>
 <p>This hook is meant primarily for notification, and cannot affect\r
 the outcome of <tt>git-commit</tt>.</p>\r
 </div>\r
+<h2>post-merge</h2>\r
+<div class="sectionbody">\r
+<p>This hook is invoked by <tt>git-merge</tt>, which happens when a <tt>git pull</tt>\r
+is done on a local repository.  The hook takes a single parameter, a status\r
+flag specifying whether or not the merge being done was a squash merge.\r
+This hook cannot affect the outcome of <tt>git-merge</tt>.</p>\r
+<p>This hook can be used in conjunction with a corresponding pre-commit hook to\r
+save and restore any form of metadata associated with the working tree\r
+(eg: permissions/ownership, ACLS, etc).  See contrib/hooks/setgitperms.perl\r
+for an example of how to do this.</p>\r
+</div>\r
 <h2><a id="pre-receive"></a>pre-receive</h2>\r
 <div class="sectionbody">\r
 <p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository,\r
@@ -456,7 +467,7 @@ for the user.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:16 UTC\r
+Last updated 24-Sep-2007 07:36:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/hooks.txt b/hooks.txt
index c39edc57c4452091e2f313cb8d5cfa9d51a4b27b..58b954759610ca272b72a05db0cd14e2868ff301 100644 (file)
--- a/hooks.txt
+++ b/hooks.txt
@@ -87,6 +87,19 @@ parameter, and is invoked after a commit is made.
 This hook is meant primarily for notification, and cannot affect
 the outcome of `git-commit`.
 
+post-merge
+-----------
+
+This hook is invoked by `git-merge`, which happens when a `git pull`
+is done on a local repository.  The hook takes a single parameter, a status
+flag specifying whether or not the merge being done was a squash merge.
+This hook cannot affect the outcome of `git-merge`.
+
+This hook can be used in conjunction with a corresponding pre-commit hook to
+save and restore any form of metadata associated with the working tree
+(eg: permissions/ownership, ACLS, etc).  See contrib/hooks/setgitperms.perl
+for an example of how to do this.
+
 [[pre-receive]]
 pre-receive
 -----------