diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-01-10 23:08:45 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-01-12 10:12:20 -0800 |
| commit | 83dc443439ca0fdc9f99fc1ed623d0749ef637ed (patch) | |
| tree | b8c55f893fb22bbf919e8c2388039c0de9c75341 /mergetools/codecompare | |
| parent | cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters) (diff) | |
| download | tgif-83dc443439ca0fdc9f99fc1ed623d0749ef637ed.tar.xz | |
cat-file: don't whitespace-pad "(...)" in SYNOPSIS and usage output
Fix up whitespace issues around "(... | ...)" in the SYNOPSIS and
usage. These were introduced in ab/cat-file series. See
e145efa6059 (Merge branch 'ab/cat-file' into next, 2022-01-05). In
particular 57d6a1cf96, 5a40417876 and 97fe7250753 in that series.
We'll now correctly emit this usage output:
$ git cat-file -h
usage: git cat-file <type> <object>
or: git cat-file (-e | -p) <object>
or: git cat-file (-t | -s) [--allow-unknown-type] <object>
[...]
Before this the last line of that would be inconsistent with the
preceding "(-e | -p)":
or: git cat-file ( -t | -s ) [--allow-unknown-type] <object>
Reported-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/codecompare')
0 files changed, 0 insertions, 0 deletions