diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-11 13:18:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-11 13:18:38 -0800 |
| commit | 8d9e92b06b704a23b9e6d1e58ede04f5cb1e42f6 (patch) | |
| tree | 95f3517c1b3cffd837415e7c3ea6157e06bcc20d | |
| parent | Merge branch 'jc/abbrev-doc' (diff) | |
| parent | doc: fixing two trivial typos in Documentation/ (diff) | |
| download | tgif-8d9e92b06b704a23b9e6d1e58ede04f5cb1e42f6.tar.xz | |
Merge branch 'mc/typofix'
Docfix.
* mc/typofix:
doc: fixing two trivial typos in Documentation/
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-p4.txt | 2 | ||||
| -rw-r--r-- | Documentation/githooks.txt | 2 | ||||
| -rwxr-xr-x | git-p4.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 025ca4df11..f292c2689e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -265,7 +265,7 @@ color:: The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except -`normal` have a bright variant that can be speficied by prefixing the +`normal` have a bright variant that can be specified by prefixing the color with `bright`, like `brightred`. + Colors may also be given as numbers between 0 and 255; these use ANSI diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index dab9609013..ec233ac0c1 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -417,7 +417,7 @@ p4-post-changelist ~~~~~~~~~~~~~~~~~~ The `p4-post-changelist` hook is invoked after the submit has -successfully occured in P4. It takes no parameters and is meant +successfully occurred in P4. It takes no parameters and is meant primarily for notification and cannot affect the outcome of the git p4 submit action. diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index 4e097dc4e9..ffccfc7760 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -655,7 +655,7 @@ p4-post-changelist This hook is invoked by `git-p4 submit`. The `p4-post-changelist` hook is invoked after the submit has -successfully occured in P4. It takes no parameters and is meant +successfully occurred in P4. It takes no parameters and is meant primarily for notification and cannot affect the outcome of the git p4 submit action. @@ -1668,7 +1668,7 @@ class P4Submit(Command, P4UserMap): Submit after inspect the message file. The `p4-post-changelist` hook is invoked after the submit has successfully - occured in P4. It takes no parameters and is meant primarily for notification + occurred in P4. It takes no parameters and is meant primarily for notification and cannot affect the outcome of the git p4 submit action. """ |