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>
Jacob Keller committed
Aug 17, 2015 at 14:33 UTC
e48ad1b9b1d862dd0aad3a21c7e6ca5ec68c024c
2 files changed
+5
-4
Documentation/config.txt
+2
-2
@@ -1914,8 +1914,8 @@ notes.rewriteMode::
1914
When copying notes during a rewrite (see the
1915
"notes.rewrite.<command>" option), determines what to do if
1916
the target commit already has a note. Must be one of
1917
- `overwrite`, `concatenate`, or `ignore`. Defaults to
1918
- `concatenate`.
1917
+ `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.
1918
+ Defaults to `concatenate`.
1919
+
1920
This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
1921
environment variable.
Documentation/git-notes.txt
+3
-2
@@ -331,7 +331,8 @@ environment variable.
331
notes.rewriteMode::
332
When copying notes during a rewrite, what to do if the target
333
commit already has a note. Must be one of `overwrite`,
334
- `concatenate`, and `ignore`. Defaults to `concatenate`.
334
+ `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to
335
+ `concatenate`.
336
+
337
This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
338
environment variable.
@@ -368,7 +369,7 @@ does not match any refs is silently ignored.
369
'GIT_NOTES_REWRITE_MODE'::
370
When copying notes during a rewrite, what to do if the target
371
commit already has a note.
371
- Must be one of `overwrite`, `concatenate`, and `ignore`.
372
+ Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.
373
This overrides the `core.rewriteMode` setting.
374
375
'GIT_NOTES_REWRITE_REF'::