Skip to content

Commit fa43131

Browse files
committed
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
2 parents f1ed9d7 + 3a6e1ad commit fa43131

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

Documentation/git-notes.txt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,17 +141,16 @@ OPTIONS
141141
If multiple `-m` options are given, their values
142142
are concatenated as separate paragraphs.
143143
Lines starting with `#` and empty lines other than a
144-
single line between paragraphs will be stripped out,
145-
if you wish to keep them verbatim, use `--no-stripspace`.
144+
single line between paragraphs will be stripped out.
145+
If you wish to keep them verbatim, use `--no-stripspace`.
146146

147147
-F <file>::
148148
--file=<file>::
149149
Take the note message from the given file. Use '-' to
150150
read the note message from the standard input.
151151
Lines starting with `#` and empty lines other than a
152-
single line between paragraphs will be stripped out,
153-
if you wish to keep them verbatim, use with
154-
`--no-stripspace` option.
152+
single line between paragraphs will be stripped out.
153+
If you wish to keep them verbatim, use `--no-stripspace`.
155154

156155
-C <object>::
157156
--reuse-message=<object>::
@@ -180,9 +179,9 @@ OPTIONS
180179
--[no-]stripspace::
181180
Strip leading and trailing whitespace from the note message.
182181
Also strip out empty lines other than a single line between
183-
paragraphs. For lines starting with `#` will be stripped out
184-
in non-editor cases like "-m", "-F" and "-C", but not in
185-
editor case like "git notes edit", "-c", etc.
182+
paragraphs. Lines starting with `#` will be stripped out
183+
in non-editor cases like `-m`, `-F` and `-C`, but not in
184+
editor case like `git notes edit`, `-c`, etc.
186185

187186
--ref <ref>::
188187
Manipulate the notes tree in <ref>. This overrides

0 commit comments

Comments
 (0)