Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra committed
Apr 7, 2011 at 00:16 UTC
19299a84f7f71b1ddf0b30732776dd5b351f2f24
2 files changed
+63
-62
Documentation/config.txt
+1
-62
@@ -812,68 +812,7 @@ commit.template::
812
"{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the
813
specified user's home directory.
814
815
-diff.autorefreshindex::
816
- When using 'git diff' to compare with work tree
817
- files, do not consider stat-only change as changed.
818
- Instead, silently run `git update-index --refresh` to
819
- update the cached stat information for paths whose
820
- contents in the work tree match the contents in the
821
- index. This option defaults to true. Note that this
822
- affects only 'git diff' Porcelain, and not lower level
823
- 'diff' commands such as 'git diff-files'.
824
-
825
-diff.external::
826
- If this config variable is set, diff generation is not
827
- performed using the internal diff machinery, but using the
828
- given command. Can be overridden with the `GIT_EXTERNAL_DIFF'
829
- environment variable. The command is called with parameters
830
- as described under "git Diffs" in linkgit:git[1]. Note: if
831
- you want to use an external diff program only on a subset of
832
- your files, you might want to use linkgit:gitattributes[5] instead.
833
-
834
-diff.mnemonicprefix::
835
- If set, 'git diff' uses a prefix pair that is different from the
836
- standard "a/" and "b/" depending on what is being compared. When
837
- this configuration is in effect, reverse diff output also swaps
838
- the order of the prefixes:
839
-`git diff`;;
840
- compares the (i)ndex and the (w)ork tree;
841
-`git diff HEAD`;;
842
- compares a (c)ommit and the (w)ork tree;
843
-`git diff --cached`;;
844
- compares a (c)ommit and the (i)ndex;
845
-`git diff HEAD:file1 file2`;;
846
- compares an (o)bject and a (w)ork tree entity;
847
-`git diff --no-index a b`;;
848
- compares two non-git things (1) and (2).
849
-
850
-diff.noprefix::
851
- If set, 'git diff' does not show any source or destination prefix.
852
-
853
-diff.renameLimit::
854
- The number of files to consider when performing the copy/rename
855
- detection; equivalent to the 'git diff' option '-l'.
856
-
857
-diff.renames::
858
- Tells git to detect renames. If set to any boolean value, it
859
- will enable basic rename detection. If set to "copies" or
860
- "copy", it will detect copies, as well.
861
-
862
-diff.ignoreSubmodules::
863
- Sets the default value of --ignore-submodules. Note that this
864
- affects only 'git diff' Porcelain, and not lower level 'diff'
865
- commands such as 'git diff-files'. 'git checkout' also honors
866
- this setting when reporting uncommitted changes.
867
-
868
-diff.suppressBlankEmpty::
869
- A boolean to inhibit the standard behavior of printing a space
870
- before each empty output line. Defaults to false.
871
-
872
-diff.tool::
873
- Controls which diff tool is used. `diff.tool` overrides
874
- `merge.tool` when used by linkgit:git-difftool[1] and has
875
- the same valid values as `merge.tool` minus "tortoisemerge"
876
- and plus "kompare".
815
+include::diff-config.txt[]
816
817
difftool.<tool>.path::
818
Override the path for the given tool. This is useful in case
Documentation/diff-config.txt
new
+62
@@ -0,0 +1,62 @@
1
+diff.autorefreshindex::
2
+ When using 'git diff' to compare with work tree
3
+ files, do not consider stat-only change as changed.
4
+ Instead, silently run `git update-index --refresh` to
5
+ update the cached stat information for paths whose
6
+ contents in the work tree match the contents in the
7
+ index. This option defaults to true. Note that this
8
+ affects only 'git diff' Porcelain, and not lower level
9
+ 'diff' commands such as 'git diff-files'.
10
+
11
+diff.external::
12
+ If this config variable is set, diff generation is not
13
+ performed using the internal diff machinery, but using the
14
+ given command. Can be overridden with the `GIT_EXTERNAL_DIFF'
15
+ environment variable. The command is called with parameters
16
+ as described under "git Diffs" in linkgit:git[1]. Note: if
17
+ you want to use an external diff program only on a subset of
18
+ your files, you might want to use linkgit:gitattributes[5] instead.
19
+
20
+diff.ignoreSubmodules::
21
+ Sets the default value of --ignore-submodules. Note that this
22
+ affects only 'git diff' Porcelain, and not lower level 'diff'
23
+ commands such as 'git diff-files'. 'git checkout' also honors
24
+ this setting when reporting uncommitted changes.
25
+
26
+diff.mnemonicprefix::
27
+ If set, 'git diff' uses a prefix pair that is different from the
28
+ standard "a/" and "b/" depending on what is being compared. When
29
+ this configuration is in effect, reverse diff output also swaps
30
+ the order of the prefixes:
31
+`git diff`;;
32
+ compares the (i)ndex and the (w)ork tree;
33
+`git diff HEAD`;;
34
+ compares a (c)ommit and the (w)ork tree;
35
+`git diff --cached`;;
36
+ compares a (c)ommit and the (i)ndex;
37
+`git diff HEAD:file1 file2`;;
38
+ compares an (o)bject and a (w)ork tree entity;
39
+`git diff --no-index a b`;;
40
+ compares two non-git things (1) and (2).
41
+
42
+diff.noprefix::
43
+ If set, 'git diff' does not show any source or destination prefix.
44
+
45
+diff.renameLimit::
46
+ The number of files to consider when performing the copy/rename
47
+ detection; equivalent to the 'git diff' option '-l'.
48
+
49
+diff.renames::
50
+ Tells git to detect renames. If set to any boolean value, it
51
+ will enable basic rename detection. If set to "copies" or
52
+ "copy", it will detect copies, as well.
53
+
54
+diff.suppressBlankEmpty::
55
+ A boolean to inhibit the standard behavior of printing a space
56
+ before each empty output line. Defaults to false.
57
+
58
+diff.tool::
59
+ Controls which diff tool is used. `diff.tool` overrides
60
+ `merge.tool` when used by linkgit:git-difftool[1] and has
61
+ the same valid values as `merge.tool` minus "tortoisemerge"
62
+ and plus "kompare".