doc: moved merge.* config variables into separate merge-config.txt
Include the new file from config.txt and git-merge.txt. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor committed
Apr 6, 2008 at 03:23 UTC
f5a84c372f8f044899dde91f1a415d2bf963377e
3 files changed
+33
-43
Documentation/config.txt
+1
-31
@@ -768,37 +768,7 @@ man.viewer::
768
Specify the programs that may be used to display help in the
769
'man' format. See linkgit:git-help[1].
770
771
-merge.summary::
772
- Whether to include summaries of merged commits in newly created
773
- merge commit messages. False by default.
774
-
775
-merge.tool::
776
- Controls which merge resolution program is used by
777
- linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
778
- "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
779
- "opendiff". Any other value is treated is custom merge tool
780
- and there must be a corresponing mergetool.<tool>.cmd option.
781
-
782
-merge.verbosity::
783
- Controls the amount of output shown by the recursive merge
784
- strategy. Level 0 outputs nothing except a final error
785
- message if conflicts were detected. Level 1 outputs only
786
- conflicts, 2 outputs conflicts and file changes. Level 5 and
787
- above outputs debugging information. The default is level 2.
788
- Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
789
-
790
-merge.<driver>.name::
791
- Defines a human readable name for a custom low-level
792
- merge driver. See linkgit:gitattributes[5] for details.
793
-
794
-merge.<driver>.driver::
795
- Defines the command that implements a custom low-level
796
- merge driver. See linkgit:gitattributes[5] for details.
797
-
798
-merge.<driver>.recursive::
799
- Names a low-level merge driver to be used when
800
- performing an internal merge between common ancestors.
801
- See linkgit:gitattributes[5] for details.
771
+include::merge-config.txt[]
772
773
mergetool.<tool>.path::
774
Override the path for the given tool. This is useful in case
Documentation/git-merge.txt
+1
-12
@@ -46,18 +46,7 @@ linkgit:git-reset[1].
46
47
CONFIGURATION
48
-------------
49
-
50
-merge.summary::
51
- Whether to include summaries of merged commits in newly
52
- created merge commit. False by default.
53
-
54
-merge.verbosity::
55
- Controls the amount of output shown by the recursive merge
56
- strategy. Level 0 outputs nothing except a final error
57
- message if conflicts were detected. Level 1 outputs only
58
- conflicts, 2 outputs conflicts and file changes. Level 5 and
59
- above outputs debugging information. The default is level 2.
60
- Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
49
+include::merge-config.txt[]
50
51
branch.<name>.mergeoptions::
52
Sets default options for merging into branch <name>. The syntax and
Documentation/merge-config.txt
new
+31
@@ -0,0 +1,31 @@
1
+merge.summary::
2
+ Whether to include summaries of merged commits in newly created
3
+ merge commit messages. False by default.
4
+
5
+merge.tool::
6
+ Controls which merge resolution program is used by
7
+ linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
8
+ "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
9
+ "opendiff". Any other value is treated is custom merge tool
10
+ and there must be a corresponing mergetool.<tool>.cmd option.
11
+
12
+merge.verbosity::
13
+ Controls the amount of output shown by the recursive merge
14
+ strategy. Level 0 outputs nothing except a final error
15
+ message if conflicts were detected. Level 1 outputs only
16
+ conflicts, 2 outputs conflicts and file changes. Level 5 and
17
+ above outputs debugging information. The default is level 2.
18
+ Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
19
+
20
+merge.<driver>.name::
21
+ Defines a human readable name for a custom low-level
22
+ merge driver. See linkgit:gitattributes[5] for details.
23
+
24
+merge.<driver>.driver::
25
+ Defines the command that implements a custom low-level
26
+ merge driver. See linkgit:gitattributes[5] for details.
27
+
28
+merge.<driver>.recursive::
29
+ Names a low-level merge driver to be used when
30
+ performing an internal merge between common ancestors.
31
+ See linkgit:gitattributes[5] for details.