summaryrefslogtreecommitdiff
path: root/Documentation/hooks.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-04 00:01:52 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-04 00:01:52 -0700
commitf63237a18e951b93ac46a0e594f286255e1eaaaf (patch)
treea131e9466bc5ca7ca42e31e71274ce3152dc8615 /Documentation/hooks.txt
parentMerge branch 'jc/fmt-patch' into next (diff)
parentCleanup git-send-email.perl:extract_valid_email (diff)
downloadtgif-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.xz
Merge branch 'vb/sendemail' into next
* vb/sendemail: Cleanup git-send-email.perl:extract_valid_email read-tree --reset: update working tree file for conflicted paths. Documentation: Spelling fixes Builtin git-rev-parse. fetch: do not report "same" unless -verbose.
Diffstat (limited to 'Documentation/hooks.txt')
-rw-r--r--Documentation/hooks.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt
index 3824a9517c..e3dde39190 100644
--- a/Documentation/hooks.txt
+++ b/Documentation/hooks.txt
@@ -100,7 +100,7 @@ update
This hook is invoked by `git-receive-pack` on the remote repository,
which is happens when a `git push` is done on a local repository.
Just before updating the ref on the remote repository, the update hook
-is invoked. It's exit status determins the success or failure of
+is invoked. It's exit status determines the success or failure of
the ref update.
The hook executes once for each ref to be updated, and takes
@@ -151,7 +151,7 @@ so it is a poor place to do log old..new.
The default post-update hook, when enabled, runs
`git-update-server-info` to keep the information used by dumb
-transports (eg, http) up-to-date. If you are publishing
+transports (e.g., http) up-to-date. If you are publishing
a git repository that is accessible via http, you should
probably enable this hook.