summaryrefslogtreecommitdiff
path: root/Documentation/git-p4.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-11 13:18:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-11 13:18:38 -0800
commit8d9e92b06b704a23b9e6d1e58ede04f5cb1e42f6 (patch)
tree95f3517c1b3cffd837415e7c3ea6157e06bcc20d /Documentation/git-p4.txt
parentMerge branch 'jc/abbrev-doc' (diff)
parentdoc: fixing two trivial typos in Documentation/ (diff)
downloadtgif-8d9e92b06b704a23b9e6d1e58ede04f5cb1e42f6.tar.xz
Merge branch 'mc/typofix'
Docfix. * mc/typofix: doc: fixing two trivial typos in Documentation/
Diffstat (limited to 'Documentation/git-p4.txt')
-rw-r--r--Documentation/git-p4.txt2
1 files changed, 1 insertions, 1 deletions
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.