mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tl/notes-separator'

Browse Source 
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
parent f1ed9d7dc0 3a6e1ad80b
commit fa43131a09
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/git-notes.txt
View File

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