Skip to content

Commit fb981ce

Browse files
pcloudsgitster
authored andcommitted
config.txt: move gui part out to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3d28c3d commit fb981ce

File tree

2 files changed

+58
-57
lines changed

2 files changed

+58
-57
lines changed

Documentation/config.txt

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1749,63 +1749,7 @@ gpg.<format>.program::
17491749
be used as a legacy synonym for `gpg.openpgp.program`. The default
17501750
value for `gpg.x509.program` is "gpgsm".
17511751

1752-
gui.commitMsgWidth::
1753-
Defines how wide the commit message window is in the
1754-
linkgit:git-gui[1]. "75" is the default.
1755-
1756-
gui.diffContext::
1757-
Specifies how many context lines should be used in calls to diff
1758-
made by the linkgit:git-gui[1]. The default is "5".
1759-
1760-
gui.displayUntracked::
1761-
Determines if linkgit:git-gui[1] shows untracked files
1762-
in the file list. The default is "true".
1763-
1764-
gui.encoding::
1765-
Specifies the default encoding to use for displaying of
1766-
file contents in linkgit:git-gui[1] and linkgit:gitk[1].
1767-
It can be overridden by setting the 'encoding' attribute
1768-
for relevant files (see linkgit:gitattributes[5]).
1769-
If this option is not set, the tools default to the
1770-
locale encoding.
1771-
1772-
gui.matchTrackingBranch::
1773-
Determines if new branches created with linkgit:git-gui[1] should
1774-
default to tracking remote branches with matching names or
1775-
not. Default: "false".
1776-
1777-
gui.newBranchTemplate::
1778-
Is used as suggested name when creating new branches using the
1779-
linkgit:git-gui[1].
1780-
1781-
gui.pruneDuringFetch::
1782-
"true" if linkgit:git-gui[1] should prune remote-tracking branches when
1783-
performing a fetch. The default value is "false".
1784-
1785-
gui.trustmtime::
1786-
Determines if linkgit:git-gui[1] should trust the file modification
1787-
timestamp or not. By default the timestamps are not trusted.
1788-
1789-
gui.spellingDictionary::
1790-
Specifies the dictionary used for spell checking commit messages in
1791-
the linkgit:git-gui[1]. When set to "none" spell checking is turned
1792-
off.
1793-
1794-
gui.fastCopyBlame::
1795-
If true, 'git gui blame' uses `-C` instead of `-C -C` for original
1796-
location detection. It makes blame significantly faster on huge
1797-
repositories at the expense of less thorough copy detection.
1798-
1799-
gui.copyBlameThreshold::
1800-
Specifies the threshold to use in 'git gui blame' original location
1801-
detection, measured in alphanumeric characters. See the
1802-
linkgit:git-blame[1] manual for more information on copy detection.
1803-
1804-
gui.blamehistoryctx::
1805-
Specifies the radius of history context in days to show in
1806-
linkgit:gitk[1] for the selected commit, when the `Show History
1807-
Context` menu item is invoked from 'git gui blame'. If this
1808-
variable is set to zero, the whole history is shown.
1752+
include::gui-config.txt[]
18091753

18101754
guitool.<name>.cmd::
18111755
Specifies the shell command line to execute when the corresponding item

Documentation/gui-config.txt

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
gui.commitMsgWidth::
2+
Defines how wide the commit message window is in the
3+
linkgit:git-gui[1]. "75" is the default.
4+
5+
gui.diffContext::
6+
Specifies how many context lines should be used in calls to diff
7+
made by the linkgit:git-gui[1]. The default is "5".
8+
9+
gui.displayUntracked::
10+
Determines if linkgit:git-gui[1] shows untracked files
11+
in the file list. The default is "true".
12+
13+
gui.encoding::
14+
Specifies the default encoding to use for displaying of
15+
file contents in linkgit:git-gui[1] and linkgit:gitk[1].
16+
It can be overridden by setting the 'encoding' attribute
17+
for relevant files (see linkgit:gitattributes[5]).
18+
If this option is not set, the tools default to the
19+
locale encoding.
20+
21+
gui.matchTrackingBranch::
22+
Determines if new branches created with linkgit:git-gui[1] should
23+
default to tracking remote branches with matching names or
24+
not. Default: "false".
25+
26+
gui.newBranchTemplate::
27+
Is used as suggested name when creating new branches using the
28+
linkgit:git-gui[1].
29+
30+
gui.pruneDuringFetch::
31+
"true" if linkgit:git-gui[1] should prune remote-tracking branches when
32+
performing a fetch. The default value is "false".
33+
34+
gui.trustmtime::
35+
Determines if linkgit:git-gui[1] should trust the file modification
36+
timestamp or not. By default the timestamps are not trusted.
37+
38+
gui.spellingDictionary::
39+
Specifies the dictionary used for spell checking commit messages in
40+
the linkgit:git-gui[1]. When set to "none" spell checking is turned
41+
off.
42+
43+
gui.fastCopyBlame::
44+
If true, 'git gui blame' uses `-C` instead of `-C -C` for original
45+
location detection. It makes blame significantly faster on huge
46+
repositories at the expense of less thorough copy detection.
47+
48+
gui.copyBlameThreshold::
49+
Specifies the threshold to use in 'git gui blame' original location
50+
detection, measured in alphanumeric characters. See the
51+
linkgit:git-blame[1] manual for more information on copy detection.
52+
53+
gui.blamehistoryctx::
54+
Specifies the radius of history context in days to show in
55+
linkgit:gitk[1] for the selected commit, when the `Show History
56+
Context` menu item is invoked from 'git gui blame'. If this
57+
variable is set to zero, the whole history is shown.

0 commit comments

Comments
 (0)