config.txt: move notes.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Oct 27, 2018 at 08:23 UTC
e50472d86d2c87c02de1cfb27b332b4fe7b31b5d
2 files changed
+60
-59
Documentation/config.txt
+1
-59
@@ -375,65 +375,7 @@ include::config/merge.txt[]
375
376
include::config/mergetool.txt[]
377
378
-notes.mergeStrategy::
379
- Which merge strategy to choose by default when resolving notes
380
- conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or
381
- `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES"
382
- section of linkgit:git-notes[1] for more information on each strategy.
383
-
384
-notes.<name>.mergeStrategy::
385
- Which merge strategy to choose when doing a notes merge into
386
- refs/notes/<name>. This overrides the more general
387
- "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in
388
- linkgit:git-notes[1] for more information on the available strategies.
389
-
390
-notes.displayRef::
391
- The (fully qualified) refname from which to show notes when
392
- showing commit messages. The value of this variable can be set
393
- to a glob, in which case notes from all matching refs will be
394
- shown. You may also specify this configuration variable
395
- several times. A warning will be issued for refs that do not
396
- exist, but a glob that does not match any refs is silently
397
- ignored.
398
-+
399
-This setting can be overridden with the `GIT_NOTES_DISPLAY_REF`
400
-environment variable, which must be a colon separated list of refs or
401
-globs.
402
-+
403
-The effective value of "core.notesRef" (possibly overridden by
404
-GIT_NOTES_REF) is also implicitly added to the list of refs to be
405
-displayed.
406
-
407
-notes.rewrite.<command>::
408
- When rewriting commits with <command> (currently `amend` or
409
- `rebase`) and this variable is set to `true`, Git
410
- automatically copies your notes from the original to the
411
- rewritten commit. Defaults to `true`, but see
412
- "notes.rewriteRef" below.
413
-
414
-notes.rewriteMode::
415
- When copying notes during a rewrite (see the
416
- "notes.rewrite.<command>" option), determines what to do if
417
- the target commit already has a note. Must be one of
418
- `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.
419
- Defaults to `concatenate`.
420
-+
421
-This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
422
-environment variable.
423
-
424
-notes.rewriteRef::
425
- When copying notes during a rewrite, specifies the (fully
426
- qualified) ref whose notes should be copied. The ref may be a
427
- glob, in which case notes in all matching refs will be copied.
428
- You may also specify this configuration several times.
429
-+
430
-Does not have a default value; you must configure this variable to
431
-enable note rewriting. Set it to `refs/notes/commits` to enable
432
-rewriting for the default commit notes.
433
-+
434
-This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
435
-environment variable, which must be a colon separated list of refs or
436
-globs.
378
+include::config/notes.txt[]
379
380
pack.window::
381
The size of the window used by linkgit:git-pack-objects[1] when no
Documentation/config/notes.txt
new
+59
@@ -0,0 +1,59 @@
1
+notes.mergeStrategy::
2
+ Which merge strategy to choose by default when resolving notes
3
+ conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or
4
+ `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES"
5
+ section of linkgit:git-notes[1] for more information on each strategy.
6
+
7
+notes.<name>.mergeStrategy::
8
+ Which merge strategy to choose when doing a notes merge into
9
+ refs/notes/<name>. This overrides the more general
10
+ "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in
11
+ linkgit:git-notes[1] for more information on the available strategies.
12
+
13
+notes.displayRef::
14
+ The (fully qualified) refname from which to show notes when
15
+ showing commit messages. The value of this variable can be set
16
+ to a glob, in which case notes from all matching refs will be
17
+ shown. You may also specify this configuration variable
18
+ several times. A warning will be issued for refs that do not
19
+ exist, but a glob that does not match any refs is silently
20
+ ignored.
21
++
22
+This setting can be overridden with the `GIT_NOTES_DISPLAY_REF`
23
+environment variable, which must be a colon separated list of refs or
24
+globs.
25
++
26
+The effective value of "core.notesRef" (possibly overridden by
27
+GIT_NOTES_REF) is also implicitly added to the list of refs to be
28
+displayed.
29
+
30
+notes.rewrite.<command>::
31
+ When rewriting commits with <command> (currently `amend` or
32
+ `rebase`) and this variable is set to `true`, Git
33
+ automatically copies your notes from the original to the
34
+ rewritten commit. Defaults to `true`, but see
35
+ "notes.rewriteRef" below.
36
+
37
+notes.rewriteMode::
38
+ When copying notes during a rewrite (see the
39
+ "notes.rewrite.<command>" option), determines what to do if
40
+ the target commit already has a note. Must be one of
41
+ `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.
42
+ Defaults to `concatenate`.
43
++
44
+This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
45
+environment variable.
46
+
47
+notes.rewriteRef::
48
+ When copying notes during a rewrite, specifies the (fully
49
+ qualified) ref whose notes should be copied. The ref may be a
50
+ glob, in which case notes in all matching refs will be copied.
51
+ You may also specify this configuration several times.
52
++
53
+Does not have a default value; you must configure this variable to
54
+enable note rewriting. Set it to `refs/notes/commits` to enable
55
+rewriting for the default commit notes.
56
++
57
+This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
58
+environment variable, which must be a colon separated list of refs or
59
+globs.