aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Documentation/git-notes.adoc9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-notes.adoc b/Documentation/git-notes.adoc
index 383e8bca68..ef5a939516 100644
--- a/Documentation/git-notes.adoc
+++ b/Documentation/git-notes.adoc
@@ -179,10 +179,19 @@ OPTIONS
Clean up whitespace. Specifically (see
linkgit:git-stripspace[1]):
+
+--
- remove trailing whitespace from all lines
- collapse multiple consecutive empty lines into one empty line
- remove empty lines from the beginning and end of the input
- add a missing `\n` to the last line if necessary.
+--
++
+`--stripspace` is the default except for
+`-C`/`--reuse-message`. However, keep in mind that this depends on the
+order of similar options. For example, for `-C <object> -m<message>`,
+`--stripspace` will be used because the default for `-m` overrides the
+previous `-C`. This is a known limitation that may be fixed in the
+future.
`--ref <ref>`::
Manipulate the notes tree in _<ref>_. This overrides