diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-14 13:40:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-14 13:40:55 -0700 |
| commit | fb3f8af7375627a61652c3e0cfe97f9f8170703f (patch) | |
| tree | 1a9a76142fae78335adc72d01898b49b2e117781 | |
| parent | Merge branch 'ds/doc-count-objects-fix' into maint-2.51 (diff) | |
| parent | doc: interpret-trailers: close all pairs of single quotes (diff) | |
| download | git-fb3f8af7375627a61652c3e0cfe97f9f8170703f.tar.gz git-fb3f8af7375627a61652c3e0cfe97f9f8170703f.zip | |
Merge branch 'kh/doc-interpret-trailers-markup-fix' into maint-2.51
Fix missing single-quote pairs in a documentation page.
* kh/doc-interpret-trailers-markup-fix:
doc: interpret-trailers: close all pairs of single quotes
| -rw-r--r-- | Documentation/git-interpret-trailers.adoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-interpret-trailers.adoc b/Documentation/git-interpret-trailers.adoc index 82c8780d93..fd335fe772 100644 --- a/Documentation/git-interpret-trailers.adoc +++ b/Documentation/git-interpret-trailers.adoc @@ -142,8 +142,8 @@ OPTIONS provided with '--if-exists' overrides the `trailer.ifExists` and any applicable `trailer.<keyAlias>.ifExists` configuration variables and applies to all '--trailer' options until the next occurrence of - '--if-exists' or '--no-if-exists'. Upon encountering '--no-if-exists, clear the - effect of any previous use of '--if-exists, such that the relevant configuration + '--if-exists' or '--no-if-exists'. Upon encountering '--no-if-exists', clear the + effect of any previous use of '--if-exists', such that the relevant configuration variables are no longer overridden. Possible actions are `addIfDifferent`, `addIfDifferentNeighbor`, `add`, `replace` and `doNothing`. @@ -154,8 +154,8 @@ OPTIONS provided with '--if-missing' overrides the `trailer.ifMissing` and any applicable `trailer.<keyAlias>.ifMissing` configuration variables and applies to all '--trailer' options until the next occurrence of - '--if-missing' or '--no-if-missing'. Upon encountering '--no-if-missing, - clear the effect of any previous use of '--if-missing, such that the relevant + '--if-missing' or '--no-if-missing'. Upon encountering '--no-if-missing', + clear the effect of any previous use of '--if-missing', such that the relevant configuration variables are no longer overridden. Possible actions are `doNothing` or `add`. |