mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'mc/typofix'
Docfix. * mc/typofix: doc: fixing two trivial typos in Documentation/
This commit is contained in:
commit
8d9e92b06b
|
@ -265,7 +265,7 @@ color::
|
||||||
The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
|
The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
|
||||||
`blue`, `magenta`, `cyan` and `white`. The first color given is the
|
`blue`, `magenta`, `cyan` and `white`. The first color given is the
|
||||||
foreground; the second is the background. All the basic colors except
|
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`.
|
color with `bright`, like `brightred`.
|
||||||
+
|
+
|
||||||
Colors may also be given as numbers between 0 and 255; these use ANSI
|
Colors may also be given as numbers between 0 and 255; these use ANSI
|
||||||
|
|
|
@ -417,7 +417,7 @@ p4-post-changelist
|
||||||
~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
The `p4-post-changelist` hook is invoked after the submit has
|
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
|
primarily for notification and cannot affect the outcome of the
|
||||||
git p4 submit action.
|
git p4 submit action.
|
||||||
|
|
||||||
|
|
|
@ -655,7 +655,7 @@ p4-post-changelist
|
||||||
This hook is invoked by `git-p4 submit`.
|
This hook is invoked by `git-p4 submit`.
|
||||||
|
|
||||||
The `p4-post-changelist` hook is invoked after the submit has
|
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
|
primarily for notification and cannot affect the outcome of the
|
||||||
git p4 submit action.
|
git p4 submit action.
|
||||||
|
|
||||||
|
|
|
@ -1668,7 +1668,7 @@ def __init__(self):
|
||||||
Submit after inspect the message file.
|
Submit after inspect the message file.
|
||||||
|
|
||||||
The `p4-post-changelist` hook is invoked after the submit has successfully
|
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.
|
and cannot affect the outcome of the git p4 submit action.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue