diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
commit | fce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch) | |
tree | ffce2ae419b52786a0e567f4fddaadd89016f62c /githooks.html | |
parent | bb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff) | |
download | git-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz |
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'githooks.html')
-rw-r--r-- | githooks.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/githooks.html b/githooks.html index 11cf4971c..f130c11a8 100644 --- a/githooks.html +++ b/githooks.html @@ -384,7 +384,7 @@ properties.</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>
+<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> and is not executed,
@@ -397,7 +397,7 @@ for an example of how to do this.</p> <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,
-which happens when a <tt>git push</tt> is done on a local repository.
+which happens when a <tt>git-push</tt> is done on a local repository.
Just before starting to update refs on the remote repository, the
pre-receive hook is invoked. Its exit status determines the success
or failure of the update.</p>
@@ -422,7 +422,7 @@ for the user.</p> <h2><a id="update"></a>update</h2>
<div class="sectionbody">
<p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository,
-which happens when a <tt>git push</tt> is done on a local repository.
+which happens when a <tt>git-push</tt> is done on a local repository.
Just before updating the ref on the remote repository, the update hook
is invoked. Its exit status determines the success or failure of
the ref update.</p>
@@ -469,7 +469,7 @@ unannotated tags to be pushed.</p> <h2><a id="post-receive"></a>post-receive</h2>
<div class="sectionbody">
<p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository,
-which happens when a <tt>git push</tt> is done on a local repository.
+which happens when a <tt>git-push</tt> is done on a local repository.
It executes on the remote repository once after all the refs have
been updated.</p>
<p>This hook executes once for the receive operation. It takes no
@@ -492,7 +492,7 @@ emails.</p> <h2><a id="post-update"></a>post-update</h2>
<div class="sectionbody">
<p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository,
-which happens when a <tt>git push</tt> is done on a local repository.
+which happens when a <tt>git-push</tt> is done on a local repository.
It executes on the remote repository once after all the refs have
been updated.</p>
<p>It takes a variable number of parameters, each of which is the
@@ -526,7 +526,7 @@ to abort.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 25-Jun-2008 08:07:17 UTC
+Last updated 02-Jul-2008 03:02:10 UTC
</div>
</div>
</body>
|