diff options
| author | Jonathan Nieder <jrnieder@uchicago.edu> | 2008-06-30 06:09:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-02 00:20:15 (GMT) |
| commit | b1889c36d85514e5e70462294c561a02c2edfe2b (patch) | |
| tree | 9a171d7e3fb8063c239a2c9c4dcec744a202de07 /Documentation/githooks.txt | |
| parent | 46e56e81b3bc91af7071809fbda8dcdec22c4cb1 (diff) | |
| download | git-b1889c36d85514e5e70462294c561a02c2edfe2b.zip git-b1889c36d85514e5e70462294c561a02c2edfe2b.tar.gz git-b1889c36d85514e5e70462294c561a02c2edfe2b.tar.bz2 | |
Documentation: be consistent about "git-" versus "git "
Since the git-* commands are not installed in $(bindir), using
"git-command <parameters>" 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 <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/githooks.txt')
| -rw-r--r-- | Documentation/githooks.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index 262a4f1..6a0d098 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. |