notes: document cat_sort_uniq rewriteMode

Teach documentation about the cat_sort_uniq rewriteMode that got added
at the same time as the equivalent merge strategy.

Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 43bb53c0477276d81af484cdb64855698b6a635b..9a6140b81ca1a006806b6077054ab36f4ecc9d58 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1914,8 +1914,8 @@ notes.rewriteMode::
        When copying notes during a rewrite (see the
        "notes.rewrite.<command>" option), determines what to do if
        the target commit already has a note.  Must be one of
        When copying notes during a rewrite (see the
        "notes.rewrite.<command>" option), determines what to do if
        the target commit already has a note.  Must be one of

-       `overwrite`, `concatenate`, or `ignore`.  Defaults to
-       `concatenate`.
+       `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.
+       Defaults to `concatenate`.

 +
 This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
 environment variable.
 +
 This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
 environment variable.

diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 851518d531b53966dc6dca1321c71e8381f50e7b..00c84be33ca950012af99d61878919974401c4a0 100644 (file)
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -331,7 +331,8 @@ environment variable.
 notes.rewriteMode::
        When copying notes during a rewrite, what to do if the target
        commit already has a note.  Must be one of `overwrite`,
 notes.rewriteMode::
        When copying notes during a rewrite, what to do if the target
        commit already has a note.  Must be one of `overwrite`,

-       `concatenate`, and `ignore`.  Defaults to `concatenate`.
+       `concatenate`, `cat_sort_uniq`, or `ignore`.  Defaults to
+       `concatenate`.

 +
 This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
 environment variable.
 +
 This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
 environment variable.


@@ -368,7 +369,7 @@ does not match any refs is silently ignored.
 'GIT_NOTES_REWRITE_MODE'::
        When copying notes during a rewrite, what to do if the target
        commit already has a note.
 'GIT_NOTES_REWRITE_MODE'::
        When copying notes during a rewrite, what to do if the target
        commit already has a note.

-       Must be one of `overwrite`, `concatenate`, and `ignore`.
+       Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.

        This overrides the `core.rewriteMode` setting.
 
 'GIT_NOTES_REWRITE_REF'::
        This overrides the `core.rewriteMode` setting.
 
 'GIT_NOTES_REWRITE_REF'::