diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-25 10:37:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-25 10:37:12 -0700 |
| commit | 78ce6660bba5fd2faf03efd79912725dcf5be481 (patch) | |
| tree | 8ceb36d4094e360132349b91e52cef465ff6fff4 /git-p4.py | |
| parent | Merge branch 'ps/reftable-exclude' (diff) | |
| parent | upload-pack: fix a typo (diff) | |
| download | git-78ce6660bba5fd2faf03efd79912725dcf5be481.tar.gz git-78ce6660bba5fd2faf03efd79912725dcf5be481.zip | |
Merge branch 'ak/typofix-2.46-maint'
Typofix.
* ak/typofix-2.46-maint:
upload-pack: fix a typo
sideband: fix a typo
setup: fix a typo
run-command: fix a typo
revision: fix a typo
refs: fix typos
rebase: fix a typo
read-cache-ll: fix a typo
pretty: fix a typo
object-file: fix a typo
merge-ort: fix typos
merge-ll: fix a typo
http: fix a typo
gpg-interface: fix a typo
git-p4: fix typos
git-instaweb: fix a typo
fsmonitor-settings: fix a typo
diffcore-rename: fix typos
config.mak.dev: fix a typo
Diffstat (limited to 'git-p4.py')
| -rwxr-xr-x | git-p4.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -54,7 +54,7 @@ import time import zipfile import zlib -# On python2.7 where raw_input() and input() are both availble, +# On python2.7 where raw_input() and input() are both available, # we want raw_input's semantics, but aliased to input for python3 # compatibility # support basestring in python3 @@ -1804,7 +1804,7 @@ class P4Submit(Command, P4UserMap): status from the script will abort the process. The purpose of the hook is to edit the message file in place, and it is not - supressed by the `--no-verify` option. This hook is called even if + suppressed by the `--no-verify` option. This hook is called even if `--prepare-p4-only` is set. The `p4-changelist` hook is executed after the changelist message has been |
