diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-09 14:26:07 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-09 14:26:07 +0000 |
| commit | 8a6a35290a9eb7d3124d96575063e54d255d50ab (patch) | |
| tree | 62f3442246f10e33f0711b96cc3711f848c7cdc1 | |
| parent | 440345bd977caac1b604085feca4b46b4c1eea01 (diff) | |
| parent | d9c49435a743fab3eb475cf2930245ea3f934fbd (diff) | |
| download | gitlab-ce-8a6a35290a9eb7d3124d96575063e54d255d50ab.tar.gz | |
Merge branch 'doc-custom-hooks' into 'master'
Fix typo and explain the precedence of STDERR and STDOUT
## What does this MR do?
Addresses comments https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5088#note_12884564
See merge request !5169
| -rw-r--r-- | doc/administration/custom_hooks.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/administration/custom_hooks.md b/doc/administration/custom_hooks.md index 9fd7b71d2dc..e3306c22d3f 100644 --- a/doc/administration/custom_hooks.md +++ b/doc/administration/custom_hooks.md @@ -48,7 +48,8 @@ as appropriate. This feature was [introduced][5073] in GitLab 8.10. If the commit is declined or an error occurs during the Git hook check, -the STDERR and/or SDOUT message of the hook will be present in GitLab's UI. +the STDERR or STDOUT message of the hook will be present in GitLab's UI. +STDERR takes precedence over STDOUT.  |