Skip to content

Commit fc1996f

Browse files
committed
git-cola v4.15.0-beta1
1 parent 53bf86c commit fc1996f

21 files changed

Lines changed: 1419 additions & 1287 deletions

share/doc/git-cola/git-cola.rst

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,29 @@ CONFIGURATION VARIABLES
818818

819819
These variables can be set using `git config` or from the settings.
820820

821+
cola.aspell.enabled
822+
-------------------
823+
824+
Set to `true` to enable support for ``aspell`` spellcheck dictionaries.
825+
When `false`, spellcheck dictionaries are read from ``/usr/share/dict/words``
826+
by default. When `true` Git Cola will run ``aspell dump master --lang=$lang``
827+
for each of the installed languages to gather words.
828+
Defaults to `false`.
829+
830+
cola.aspell.lang
831+
----------------
832+
833+
Configure the language names that are queried using ``aspell``. For example,
834+
``git config --global --add cola.aspell.lang en_US`` will make it so that
835+
only the ``en_US`` language is used.
836+
837+
This is a multi-valued configuration value.
838+
``git config --global --add cola.aspell.lang $lang`` can be run once for each language
839+
to specify multiple languages to use.
840+
841+
When unset, all of the two-letter language names from the output of
842+
``aspell dicts`` will be used.
843+
821844
cola.autodetectproxy
822845
--------------------
823846

@@ -887,6 +910,16 @@ If `$XDG_DATA_DIRS` is undefined or set to an empty value then `/usr/local/share
887910
`/usr/share` are searched for dictionary files.
888911

889912
Dictionary files are newline-separated and contain one word per line.
913+
Dictionary files must be UTF-8 encoded.
914+
915+
If you have multiple dictionaries that you would like `git cola` to use then
916+
you can specify multiple dictionaries using ``git config --global --add``.
917+
``cola.dictionary`` is a configuration value that can contain multiple values.
918+
919+
.. sourcecode:: sh
920+
921+
git config --global --add cola.dictionary /path/to/dictionary1
922+
git config --global --add cola.dictionary /path/to/dictionary2
890923

891924
cola.expandtab
892925
--------------

share/doc/git-cola/html/genindex.html

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@
44
<meta name="viewport" content="width=device-width,initial-scale=1"/>
55
<meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="#" /><link rel="search" title="Search" href="search.html" />
66

7-
<!-- Generated with Sphinx 8.1.3 and Furo 2024.08.06 --><title>Index - Git Cola 4.14.0 documentation</title>
8-
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
9-
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=354aac6f" />
10-
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=302659d7" />
7+
<!-- Generated with Sphinx 8.2.3 and Furo 2025.07.19 --><title>Index - Git Cola 4.14.0 documentation</title>
8+
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=acfd86a5" />
9+
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=25af2a20" />
10+
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=8dab3a3b" />
1111

1212

1313

1414

1515
<style>
1616
body {
17-
--color-code-background: #f8f8f8;
18-
--color-code-foreground: black;
17+
--color-code-background: #f2f2f2;
18+
--color-code-foreground: #1e1e1e;
1919

2020
}
2121
@media not print {
2222
body[data-theme="dark"] {
23-
--color-code-background: #202020;
24-
--color-code-foreground: #d0d0d0;
23+
--color-code-background: #2b2b2b;
24+
--color-code-foreground: #f8f8f2;
2525

2626
}
2727
@media (prefers-color-scheme: dark) {
2828
body:not([data-theme="light"]) {
29-
--color-code-background: #202020;
30-
--color-code-foreground: #d0d0d0;
29+
--color-code-background: #2b2b2b;
30+
--color-code-foreground: #f8f8f2;
3131

3232
}
3333
}
@@ -187,7 +187,6 @@
187187

188188
<div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
189189

190-
191190
<span class="sidebar-brand-text">Git Cola 4.14.0 documentation</span>
192191

193192
</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
@@ -277,6 +276,6 @@ <h1 id="index">Index</h1>
277276
</div><script src="static/documentation_options.js?v=8edb52cd"></script>
278277
<script src="static/doctools.js?v=9bcbadda"></script>
279278
<script src="static/sphinx_highlight.js?v=dc90522c"></script>
280-
<script src="static/scripts/furo.js?v=5fa4622c"></script>
279+
<script src="static/scripts/furo.js?v=46bd48cc"></script>
281280
</body>
282281
</html>

share/doc/git-cola/html/git-cola.html

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@
55
<meta name="color-scheme" content="light dark"><meta name="viewport" content="width=device-width, initial-scale=1" />
66
<link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="git-dag" href="git-dag.html" /><link rel="prev" title="Git Cola Documentation" href="index.html" />
77

8-
<!-- Generated with Sphinx 8.1.3 and Furo 2024.08.06 -->
8+
<!-- Generated with Sphinx 8.2.3 and Furo 2025.07.19 -->
99
<title>git-cola - Git Cola 4.14.0 documentation</title>
10-
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
11-
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=354aac6f" />
12-
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=302659d7" />
10+
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=acfd86a5" />
11+
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=25af2a20" />
12+
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=8dab3a3b" />
1313

1414

1515

1616

1717
<style>
1818
body {
19-
--color-code-background: #f8f8f8;
20-
--color-code-foreground: black;
19+
--color-code-background: #f2f2f2;
20+
--color-code-foreground: #1e1e1e;
2121

2222
}
2323
@media not print {
2424
body[data-theme="dark"] {
25-
--color-code-background: #202020;
26-
--color-code-foreground: #d0d0d0;
25+
--color-code-background: #2b2b2b;
26+
--color-code-foreground: #f8f8f2;
2727

2828
}
2929
@media (prefers-color-scheme: dark) {
3030
body:not([data-theme="light"]) {
31-
--color-code-background: #202020;
32-
--color-code-foreground: #d0d0d0;
31+
--color-code-background: #2b2b2b;
32+
--color-code-foreground: #f8f8f2;
3333

3434
}
3535
}
@@ -189,7 +189,6 @@
189189

190190
<div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
191191

192-
193192
<span class="sidebar-brand-text">Git Cola 4.14.0 documentation</span>
194193

195194
</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
@@ -897,6 +896,25 @@ <h3>Custom Themes<a class="headerlink" href="#custom-themes" title="Link to this
897896
<section id="configuration-variables">
898897
<h2>CONFIGURATION VARIABLES<a class="headerlink" href="#configuration-variables" title="Link to this heading"></a></h2>
899898
<p>These variables can be set using <cite>git config</cite> or from the settings.</p>
899+
<section id="cola-aspell-enabled">
900+
<h3>cola.aspell.enabled<a class="headerlink" href="#cola-aspell-enabled" title="Link to this heading"></a></h3>
901+
<p>Set to <cite>true</cite> to enable support for <code class="docutils literal notranslate"><span class="pre">aspell</span></code> spellcheck dictionaries.
902+
When <cite>false</cite>, spellcheck dictionaries are read from <code class="docutils literal notranslate"><span class="pre">/usr/share/dict/words</span></code>
903+
by default. When <cite>true</cite> Git Cola will run <code class="docutils literal notranslate"><span class="pre">aspell</span> <span class="pre">dump</span> <span class="pre">master</span> <span class="pre">--lang=$lang</span></code>
904+
for each of the installed languages to gather words.
905+
Defaults to <cite>false</cite>.</p>
906+
</section>
907+
<section id="cola-aspell-lang">
908+
<h3>cola.aspell.lang<a class="headerlink" href="#cola-aspell-lang" title="Link to this heading"></a></h3>
909+
<p>Configure the language names that are queried using <code class="docutils literal notranslate"><span class="pre">aspell</span></code>. For example,
910+
<code class="docutils literal notranslate"><span class="pre">git</span> <span class="pre">config</span> <span class="pre">--global</span> <span class="pre">--add</span> <span class="pre">cola.aspell.lang</span> <span class="pre">en_US</span></code> will make it so that
911+
only the <code class="docutils literal notranslate"><span class="pre">en_US</span></code> language is used.</p>
912+
<p>This is a multi-valued configuration value.
913+
<code class="docutils literal notranslate"><span class="pre">git</span> <span class="pre">config</span> <span class="pre">--global</span> <span class="pre">--add</span> <span class="pre">cola.aspell.lang</span> <span class="pre">$lang</span></code> can be run once for each language
914+
to specify multiple languages to use.</p>
915+
<p>When unset, all of the two-letter language names from the output of
916+
<code class="docutils literal notranslate"><span class="pre">aspell</span> <span class="pre">dicts</span></code> will be used.</p>
917+
</section>
900918
<section id="cola-autodetectproxy">
901919
<h3>cola.autodetectproxy<a class="headerlink" href="#cola-autodetectproxy" title="Link to this heading"></a></h3>
902920
<p>Set to <cite>false</cite> to disable auto-configuration of HTTP proxy settings based on
@@ -953,7 +971,15 @@ <h3>cola.dictionary<a class="headerlink" href="#cola-dictionary" title="Link to
953971
files in <cite>~/.local/share</cite> and <cite>$XDG_DATA_DIRS</cite>.</p>
954972
<p>If <cite>$XDG_DATA_DIRS</cite> is undefined or set to an empty value then <cite>/usr/local/share</cite> and
955973
<cite>/usr/share</cite> are searched for dictionary files.</p>
956-
<p>Dictionary files are newline-separated and contain one word per line.</p>
974+
<p>Dictionary files are newline-separated and contain one word per line.
975+
Dictionary files must be UTF-8 encoded.</p>
976+
<p>If you have multiple dictionaries that you would like <cite>git cola</cite> to use then
977+
you can specify multiple dictionaries using <code class="docutils literal notranslate"><span class="pre">git</span> <span class="pre">config</span> <span class="pre">--global</span> <span class="pre">--add</span></code>.
978+
<code class="docutils literal notranslate"><span class="pre">cola.dictionary</span></code> is a configuration value that can contain multiple values.</p>
979+
<div class="highlight-sh notranslate"><div class="highlight"><pre><span></span>git<span class="w"> </span>config<span class="w"> </span>--global<span class="w"> </span>--add<span class="w"> </span>cola.dictionary<span class="w"> </span>/path/to/dictionary1
980+
git<span class="w"> </span>config<span class="w"> </span>--global<span class="w"> </span>--add<span class="w"> </span>cola.dictionary<span class="w"> </span>/path/to/dictionary2
981+
</pre></div>
982+
</div>
957983
</section>
958984
<section id="cola-expandtab">
959985
<h3>cola.expandtab<a class="headerlink" href="#cola-expandtab" title="Link to this heading"></a></h3>
@@ -1795,6 +1821,8 @@ <h3>Git Cola Homepage<a class="headerlink" href="#git-cola-homepage" title="Link
17951821
</ul>
17961822
</li>
17971823
<li><a class="reference internal" href="#configuration-variables">CONFIGURATION VARIABLES</a><ul>
1824+
<li><a class="reference internal" href="#cola-aspell-enabled">cola.aspell.enabled</a></li>
1825+
<li><a class="reference internal" href="#cola-aspell-lang">cola.aspell.lang</a></li>
17981826
<li><a class="reference internal" href="#cola-autodetectproxy">cola.autodetectproxy</a></li>
17991827
<li><a class="reference internal" href="#cola-autocompletepaths">cola.autocompletepaths</a></li>
18001828
<li><a class="reference internal" href="#cola-autoloadcommittemplate">cola.autoloadCommitTemplate</a></li>
@@ -1912,6 +1940,6 @@ <h3>Git Cola Homepage<a class="headerlink" href="#git-cola-homepage" title="Link
19121940
</div><script src="static/documentation_options.js?v=8edb52cd"></script>
19131941
<script src="static/doctools.js?v=9bcbadda"></script>
19141942
<script src="static/sphinx_highlight.js?v=dc90522c"></script>
1915-
<script src="static/scripts/furo.js?v=5fa4622c"></script>
1943+
<script src="static/scripts/furo.js?v=46bd48cc"></script>
19161944
</body>
19171945
</html>

share/doc/git-cola/html/git-dag.html

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@
55
<meta name="color-scheme" content="light dark"><meta name="viewport" content="width=device-width, initial-scale=1" />
66
<link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Thanks" href="thanks.html" /><link rel="prev" title="git-cola" href="git-cola.html" />
77

8-
<!-- Generated with Sphinx 8.1.3 and Furo 2024.08.06 -->
8+
<!-- Generated with Sphinx 8.2.3 and Furo 2025.07.19 -->
99
<title>git-dag - Git Cola 4.14.0 documentation</title>
10-
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
11-
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=354aac6f" />
12-
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=302659d7" />
10+
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=acfd86a5" />
11+
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=25af2a20" />
12+
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=8dab3a3b" />
1313

1414

1515

1616

1717
<style>
1818
body {
19-
--color-code-background: #f8f8f8;
20-
--color-code-foreground: black;
19+
--color-code-background: #f2f2f2;
20+
--color-code-foreground: #1e1e1e;
2121

2222
}
2323
@media not print {
2424
body[data-theme="dark"] {
25-
--color-code-background: #202020;
26-
--color-code-foreground: #d0d0d0;
25+
--color-code-background: #2b2b2b;
26+
--color-code-foreground: #f8f8f2;
2727

2828
}
2929
@media (prefers-color-scheme: dark) {
3030
body:not([data-theme="light"]) {
31-
--color-code-background: #202020;
32-
--color-code-foreground: #d0d0d0;
31+
--color-code-background: #2b2b2b;
32+
--color-code-foreground: #f8f8f2;
3333

3434
}
3535
}
@@ -189,7 +189,6 @@
189189

190190
<div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
191191

192-
193192
<span class="sidebar-brand-text">Git Cola 4.14.0 documentation</span>
194193

195194
</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
@@ -416,6 +415,6 @@ <h3>log.date<a class="headerlink" href="#log-date" title="Link to this heading">
416415
</div><script src="static/documentation_options.js?v=8edb52cd"></script>
417416
<script src="static/doctools.js?v=9bcbadda"></script>
418417
<script src="static/sphinx_highlight.js?v=dc90522c"></script>
419-
<script src="static/scripts/furo.js?v=5fa4622c"></script>
418+
<script src="static/scripts/furo.js?v=46bd48cc"></script>
420419
</body>
421420
</html>

share/doc/git-cola/html/index.html

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@
55
<meta name="color-scheme" content="light dark"><meta name="viewport" content="width=device-width, initial-scale=1" />
66
<link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="git-cola" href="git-cola.html" />
77

8-
<!-- Generated with Sphinx 8.1.3 and Furo 2024.08.06 -->
8+
<!-- Generated with Sphinx 8.2.3 and Furo 2025.07.19 -->
99
<title>Git Cola 4.14.0 documentation</title>
10-
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
11-
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=354aac6f" />
12-
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=302659d7" />
10+
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=acfd86a5" />
11+
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=25af2a20" />
12+
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=8dab3a3b" />
1313

1414

1515

1616

1717
<style>
1818
body {
19-
--color-code-background: #f8f8f8;
20-
--color-code-foreground: black;
19+
--color-code-background: #f2f2f2;
20+
--color-code-foreground: #1e1e1e;
2121

2222
}
2323
@media not print {
2424
body[data-theme="dark"] {
25-
--color-code-background: #202020;
26-
--color-code-foreground: #d0d0d0;
25+
--color-code-background: #2b2b2b;
26+
--color-code-foreground: #f8f8f2;
2727

2828
}
2929
@media (prefers-color-scheme: dark) {
3030
body:not([data-theme="light"]) {
31-
--color-code-background: #202020;
32-
--color-code-foreground: #d0d0d0;
31+
--color-code-background: #2b2b2b;
32+
--color-code-foreground: #f8f8f2;
3333

3434
}
3535
}
@@ -189,7 +189,6 @@
189189

190190
<div class="sidebar-sticky"><a class="sidebar-brand" href="#">
191191

192-
193192
<span class="sidebar-brand-text">Git Cola 4.14.0 documentation</span>
194193

195194
</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
@@ -324,6 +323,8 @@ <h1>Git Cola Documentation<a class="headerlink" href="#git-cola-documentation" t
324323
</ul>
325324
</li>
326325
<li class="toctree-l2"><a class="reference internal" href="git-cola.html#configuration-variables">CONFIGURATION VARIABLES</a><ul>
326+
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-aspell-enabled">cola.aspell.enabled</a></li>
327+
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-aspell-lang">cola.aspell.lang</a></li>
327328
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-autodetectproxy">cola.autodetectproxy</a></li>
328329
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-autocompletepaths">cola.autocompletepaths</a></li>
329330
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-autoloadcommittemplate">cola.autoloadCommitTemplate</a></li>
@@ -460,6 +461,7 @@ <h2>Release Notes<a class="headerlink" href="#release-notes" title="Link to this
460461
<li class="toctree-l1"><a class="reference internal" href="relnotes.html">Releases</a><ul>
461462
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#latest-release">Latest Release</a></li>
462463
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#development-version">Development version</a></li>
464+
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#upcoming">Upcoming</a></li>
463465
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-14-0">v4.14.0</a></li>
464466
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-13-0">v4.13.0</a></li>
465467
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-12-0">v4.12.0</a></li>
@@ -648,6 +650,6 @@ <h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Li
648650
</div><script src="static/documentation_options.js?v=8edb52cd"></script>
649651
<script src="static/doctools.js?v=9bcbadda"></script>
650652
<script src="static/sphinx_highlight.js?v=dc90522c"></script>
651-
<script src="static/scripts/furo.js?v=5fa4622c"></script>
653+
<script src="static/scripts/furo.js?v=46bd48cc"></script>
652654
</body>
653655
</html>

0 commit comments

Comments
 (0)