Merge branch 'tl/notes-separator'

Typo/grammofix to documentation added during this cycle.

* tl/notes-separator:
  notes doc: tidy up `--no-stripspace` paragraph
  notes doc: split up run-on sentences
This commit is contained in:
Junio C Hamano
2023-08-17 15:50:05 -07:00

View File

@ -141,17 +141,16 @@ OPTIONS
If multiple `-m` options are given, their values
are concatenated as separate paragraphs.
Lines starting with `#` and empty lines other than a
single line between paragraphs will be stripped out,
if you wish to keep them verbatim, use `--no-stripspace`.
single line between paragraphs will be stripped out.
If you wish to keep them verbatim, use `--no-stripspace`.
-F <file>::
--file=<file>::
Take the note message from the given file. Use '-' to
read the note message from the standard input.
Lines starting with `#` and empty lines other than a
single line between paragraphs will be stripped out,
if you wish to keep them verbatim, use with
`--no-stripspace` option.
single line between paragraphs will be stripped out.
If you wish to keep them verbatim, use `--no-stripspace`.
-C <object>::
--reuse-message=<object>::
@ -180,9 +179,9 @@ OPTIONS
--[no-]stripspace::
Strip leading and trailing whitespace from the note message.
Also strip out empty lines other than a single line between
paragraphs. For lines starting with `#` will be stripped out
in non-editor cases like "-m", "-F" and "-C", but not in
editor case like "git notes edit", "-c", etc.
paragraphs. Lines starting with `#` will be stripped out
in non-editor cases like `-m`, `-F` and `-C`, but not in
editor case like `git notes edit`, `-c`, etc.
--ref <ref>::
Manipulate the notes tree in <ref>. This overrides