diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-25 14:22:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-25 14:22:02 -0700 |
| commit | 0d8f4ccfe3b13bb5eb95f030dc5fe76efb255397 (patch) | |
| tree | d7c7205b2ae9788e006996be6f8074978f215507 /Documentation/git-am.adoc | |
| parent | 109c3df14ccf372c2438a470bdfb566265399f0a (diff) | |
| parent | 84f3d6e11e085a52e561a509f2433208f22c6d3b (diff) | |
| download | git-0d8f4ccfe3b13bb5eb95f030dc5fe76efb255397.tar.xz | |
Merge branch 'ja/doc-lint-sections-and-synopsis'
Doc lint updates to encourage the newer and easier-to-use
`synopsis` format, with fixes to a handful of existing uses.
* ja/doc-lint-sections-and-synopsis:
doc lint: check that synopsis manpages have synopsis inlines
doc:git-for-each-ref: fix styling and typos
doc: check for absence of the form --[no-]parameter
doc: check for absence of multiple terms in each entry of desc list
doc: check well-formedness of delimited sections
doc: test linkgit macros for well-formedness
Diffstat (limited to 'Documentation/git-am.adoc')
| -rw-r--r-- | Documentation/git-am.adoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-am.adoc b/Documentation/git-am.adoc index 221070de48..b23b4fba20 100644 --- a/Documentation/git-am.adoc +++ b/Documentation/git-am.adoc @@ -48,7 +48,8 @@ OPTIONS --keep-non-patch:: Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). ---[no-]keep-cr:: +--keep-cr:: +--no-keep-cr:: With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) with the same option, to prevent it from stripping CR at the end of lines. `am.keepcr` configuration variable can be used to specify the |