notes: add notes.mergeStrategy option to select default strategy

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index bb3ea9372f873ee50c3c6fb4092cd95ebbba3312..0dac4e9b86150ef2546b9fca02e211db6e667dcc 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -170,7 +170,7 @@ will want to ensure that threading is disabled for `git send-email`.
 -v <n>::
 --reroll-count=<n>::
        Mark the series as the <n>-th iteration of the topic. The
-       output filenames have `v<n>` pretended to them, and the
+       output filenames have `v<n>` prepended to them, and the
        subject prefix ("PATCH" by default, but configurable via the
        `--subject-prefix` option) has ` v<n>` appended to it.  E.g.
        `--reroll-count=4` may produce `v4-0001-add-makefile.patch`