From b1889c36d85514e5e70462294c561a02c2edfe2b Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 30 Jun 2008 01:09:04 -0500 Subject: Documentation: be consistent about "git-" versus "git " Since the git-* commands are not installed in $(bindir), using "git-command " in examples in the documentation is not a good idea. On the other hand, it is nice to be able to refer to each command using one hyphenated word. (There is no escaping it, anyway: man page names cannot have spaces in them.) This patch retains the dash in naming an operation, command, program, process, or action. Complete command lines that can be entered at a shell (i.e., without options omitted) are made to use the dashless form. The changes consist only of replacing some spaces with hyphens and vice versa. After a "s/ /-/g", the unpatched and patched versions are identical. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/githooks.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Documentation/githooks.txt') diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index 262a4f162..6a0d098f7 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -147,7 +147,7 @@ properties. post-merge ----------- -This hook is invoked by `git-merge`, which happens when a `git pull` +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` and is not executed, @@ -163,7 +163,7 @@ pre-receive ----------- This hook is invoked by `git-receive-pack` on the remote repository, -which happens when a `git push` is done on a local repository. +which happens when a `git-push` 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. @@ -192,7 +192,7 @@ update ------ This hook is invoked by `git-receive-pack` on the remote repository, -which happens when a `git push` is done on a local repository. +which 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. Its exit status determines the success or failure of the ref update. @@ -235,7 +235,7 @@ post-receive ------------ This hook is invoked by `git-receive-pack` on the remote repository, -which happens when a `git push` is done on a local repository. +which happens when a `git-push` is done on a local repository. It executes on the remote repository once after all the refs have been updated. @@ -265,7 +265,7 @@ post-update ----------- This hook is invoked by `git-receive-pack` on the remote repository, -which happens when a `git push` is done on a local repository. +which happens when a `git-push` is done on a local repository. It executes on the remote repository once after all the refs have been updated. -- cgit v1.2.1