From 01d8f834b49b23198aaf6ab7d503b8e918876c7a Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 24 Sep 2007 07:37:30 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.5.3.2-99-ge4b2

---
 git-apply.html | 12 +++++++-----
 git-apply.txt  | 11 +++++++----
 hooks.html     | 13 ++++++++++++-
 hooks.txt      | 13 +++++++++++++
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/git-apply.html b/git-apply.html
index a26adc3f7..063349350 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -274,7 +274,7 @@ git-apply(1) Manual Page
 <div class="sectionbody">
 <div class="verseblock">
 <div class="content"><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index]
-          [--apply] [--no-add] [--index-info] [-R | --reverse]
+          [--apply] [--no-add] [--build-fake-ancestor &lt;file&gt;] [-R | --reverse]
           [--allow-binary-replacement | --binary] [--reject] [-z]
           [-pNUM] [-CNUM] [--inaccurate-eof] [--cached]
           [--whitespace=&lt;nowarn|warn|error|error-all|strip&gt;]
@@ -364,16 +364,18 @@ and a work tree.</p>
 </p>
 </dd>
 <dt>
---index-info
+--build-fake-ancestor &lt;file&gt;
 </dt>
 <dd>
 <p>
         Newer git-diff output has embedded <em>index information</em>
         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.
 </p>
+<p>When a pure mode change is encountered (which has no index information),
+the information is read from the current index instead.</p>
 </dd>
 <dt>
 -R, --reverse
@@ -597,7 +599,7 @@ subdirectory is checked and (if possible) updated.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 16-Aug-2007 04:58:55 UTC
+Last updated 24-Sep-2007 07:36:59 UTC
 </div>
 </div>
 </body>
diff --git a/git-apply.txt b/git-apply.txt
index 4c7e3a2f7..c1c54bfe0 100644
--- 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 28cd7d6da..4501dcfa0 100644
--- 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
 the outcome of <tt>git-commit</tt>.</p>
 </div>
+<h2>post-merge</h2>
+<div class="sectionbody">
+<p>This hook is invoked by <tt>git-merge</tt>, which happens when a <tt>git pull</tt>
+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 <tt>git-merge</tt>.</p>
+<p>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.</p>
+</div>
 <h2><a id="pre-receive"></a>pre-receive</h2>
 <div class="sectionbody">
 <p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository,
@@ -456,7 +467,7 @@ for the user.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 25-Aug-2007 03:53:16 UTC
+Last updated 24-Sep-2007 07:36:59 UTC
 </div>
 </div>
 </body>
diff --git a/hooks.txt b/hooks.txt
index c39edc57c..58b954759 100644
--- 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
 -----------
-- 
2.26.2