Skip to content

Commit ea7918f

Browse files
committed
git-cola v4.7.0
Signed-off-by: David Aguilar <[email protected]>
1 parent 916997d commit ea7918f

22 files changed

+961
-878
lines changed

_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ maruku:
88
png_dir: images/latex
99
png_url: /images/latex
1010

11-
cola_version: "4.6.1"
12-
cola_release_date: "2024-03-03"
11+
cola_version: "4.7.0"
12+
cola_release_date: "2024-05-02"
1313
cola_downloads: "https://github.com/git-cola/git-cola/releases/download"
1414
cola_archive: "https://github.com/git-cola/git-cola/archive"
1515
cola_github: "https://github.com/git-cola/git-cola"

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,12 @@ cola.statusshowtotals
855855
Set to `true` to display files counts in the Status widget's category titles.
856856
Defaults to `false`.
857857

858+
cola.sync
859+
---------
860+
Set to `false` to disable calling `os.fdatasync()` / `os.fdata()` when saving
861+
settings. Defaults to `true`, which means that these functions are called when windows
862+
are closed and their settings are saved.
863+
858864
cola.tabwidth
859865
-------------
860866
The number of columns occupied by a tab character. Defaults to 8.

share/doc/git-cola/hotkeys.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<td>Merge branches</td>
104104
</tr>
105105
<tr>
106-
<td class="shortcut">Ctrl + m</td>
106+
<td class="shortcut">Alt + M</td>
107107
<td>:</td>
108108
<td>Amend last commit</td>
109109
</tr>

share/doc/git-cola/hotkeys_de.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<td>Merge branches</td>
108108
</tr>
109109
<tr>
110-
<td class="shortcut">Ctrl + M</td>
110+
<td class="shortcut">Alt + M</td>
111111
<td>:</td>
112112
<td>Letzte Version nachbessern</td>
113113
</tr>

share/doc/git-cola/hotkeys_zh_CN.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<td>Merge branches</td>
106106
</tr>
107107
<tr>
108-
<td class="shortcut">Ctrl + M</td>
108+
<td class="shortcut">Alt + M</td>
109109
<td>:</td>
110110
<td>修正前一次提交</td>
111111
</tr>

share/doc/git-cola/hotkeys_zh_TW.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<td>合併分支</td>
105105
</tr>
106106
<tr>
107-
<td class="shortcut">Ctrl + M</td>
107+
<td class="shortcut">Alt + M</td>
108108
<td>:</td>
109109
<td>修正前一次的版本提交</td>
110110
</tr>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
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 7.2.6 and Furo 2024.01.29 --><title>Index - Git Cola 4.6.1 documentation</title>
8-
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=362ab14a" />
7+
<!-- Generated with Sphinx 7.2.6 and Furo 2024.01.29 --><title>Index - Git Cola 4.7.0 documentation</title>
8+
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
99
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=135e06be" />
1010
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=36a5483c" />
1111

@@ -121,7 +121,7 @@
121121
</label>
122122
</div>
123123
<div class="header-center">
124-
<a href="index.html"><div class="brand">Git Cola 4.6.1 documentation</div></a>
124+
<a href="index.html"><div class="brand">Git Cola 4.7.0 documentation</div></a>
125125
</div>
126126
<div class="header-right">
127127
<div class="theme-toggle-container theme-toggle-header">
@@ -144,7 +144,7 @@
144144
<div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
145145

146146

147-
<span class="sidebar-brand-text">Git Cola 4.6.1 documentation</span>
147+
<span class="sidebar-brand-text">Git Cola 4.7.0 documentation</span>
148148

149149
</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
150150
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -229,7 +229,7 @@ <h1 id="index">Index</h1>
229229

230230
</aside>
231231
</div>
232-
</div><script src="static/documentation_options.js?v=68f2c66a"></script>
232+
</div><script src="static/documentation_options.js?v=bd5f082a"></script>
233233
<script src="static/doctools.js?v=888ff710"></script>
234234
<script src="static/sphinx_highlight.js?v=dc90522c"></script>
235235
<script src="static/scripts/furo.js?v=32e29ea5"></script>

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
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

88
<!-- Generated with Sphinx 7.2.6 and Furo 2024.01.29 -->
9-
<title>git-cola - Git Cola 4.6.1 documentation</title>
10-
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=362ab14a" />
9+
<title>git-cola - Git Cola 4.7.0 documentation</title>
10+
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
1111
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=135e06be" />
1212
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=36a5483c" />
1313

@@ -123,7 +123,7 @@
123123
</label>
124124
</div>
125125
<div class="header-center">
126-
<a href="index.html"><div class="brand">Git Cola 4.6.1 documentation</div></a>
126+
<a href="index.html"><div class="brand">Git Cola 4.7.0 documentation</div></a>
127127
</div>
128128
<div class="header-right">
129129
<div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
146146
<div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
147147

148148

149-
<span class="sidebar-brand-text">Git Cola 4.6.1 documentation</span>
149+
<span class="sidebar-brand-text">Git Cola 4.7.0 documentation</span>
150150

151151
</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
152152
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -963,6 +963,12 @@ <h3>cola.statusshowtotals<a class="headerlink" href="#cola-statusshowtotals" tit
963963
<p>Set to <cite>true</cite> to display files counts in the Status widget’s category titles.
964964
Defaults to <cite>false</cite>.</p>
965965
</section>
966+
<section id="cola-sync">
967+
<h3>cola.sync<a class="headerlink" href="#cola-sync" title="Link to this heading">#</a></h3>
968+
<p>Set to <cite>false</cite> to disable calling <cite>os.fdatasync()</cite> / <cite>os.fdata()</cite> when saving
969+
settings. Defaults to <cite>true</cite>, which means that these functions are called when windows
970+
are closed and their settings are saved.</p>
971+
</section>
966972
<section id="cola-tabwidth">
967973
<h3>cola.tabwidth<a class="headerlink" href="#cola-tabwidth" title="Link to this heading">#</a></h3>
968974
<p>The number of columns occupied by a tab character. Defaults to 8.</p>
@@ -1605,6 +1611,7 @@ <h3>Git Cola Homepage<a class="headerlink" href="#git-cola-homepage" title="Link
16051611
<li><a class="reference internal" href="#cola-startupmode">cola.startupmode</a></li>
16061612
<li><a class="reference internal" href="#cola-statusindent">cola.statusindent</a></li>
16071613
<li><a class="reference internal" href="#cola-statusshowtotals">cola.statusshowtotals</a></li>
1614+
<li><a class="reference internal" href="#cola-sync">cola.sync</a></li>
16081615
<li><a class="reference internal" href="#cola-tabwidth">cola.tabwidth</a></li>
16091616
<li><a class="reference internal" href="#cola-terminal">cola.terminal</a></li>
16101617
<li><a class="reference internal" href="#cola-terminalshellquote">cola.terminalshellquote</a></li>
@@ -1680,7 +1687,7 @@ <h3>Git Cola Homepage<a class="headerlink" href="#git-cola-homepage" title="Link
16801687

16811688
</aside>
16821689
</div>
1683-
</div><script src="static/documentation_options.js?v=68f2c66a"></script>
1690+
</div><script src="static/documentation_options.js?v=bd5f082a"></script>
16841691
<script src="static/doctools.js?v=888ff710"></script>
16851692
<script src="static/sphinx_highlight.js?v=dc90522c"></script>
16861693
<script src="static/scripts/furo.js?v=32e29ea5"></script>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
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

88
<!-- Generated with Sphinx 7.2.6 and Furo 2024.01.29 -->
9-
<title>git-dag - Git Cola 4.6.1 documentation</title>
10-
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=362ab14a" />
9+
<title>git-dag - Git Cola 4.7.0 documentation</title>
10+
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
1111
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=135e06be" />
1212
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=36a5483c" />
1313

@@ -123,7 +123,7 @@
123123
</label>
124124
</div>
125125
<div class="header-center">
126-
<a href="index.html"><div class="brand">Git Cola 4.6.1 documentation</div></a>
126+
<a href="index.html"><div class="brand">Git Cola 4.7.0 documentation</div></a>
127127
</div>
128128
<div class="header-right">
129129
<div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
146146
<div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
147147

148148

149-
<span class="sidebar-brand-text">Git Cola 4.6.1 documentation</span>
149+
<span class="sidebar-brand-text">Git Cola 4.7.0 documentation</span>
150150

151151
</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
152152
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -363,7 +363,7 @@ <h3>log.date<a class="headerlink" href="#log-date" title="Link to this heading">
363363

364364
</aside>
365365
</div>
366-
</div><script src="static/documentation_options.js?v=68f2c66a"></script>
366+
</div><script src="static/documentation_options.js?v=bd5f082a"></script>
367367
<script src="static/doctools.js?v=888ff710"></script>
368368
<script src="static/sphinx_highlight.js?v=dc90522c"></script>
369369
<script src="static/scripts/furo.js?v=32e29ea5"></script>

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
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

88
<!-- Generated with Sphinx 7.2.6 and Furo 2024.01.29 -->
9-
<title>Git Cola 4.6.1 documentation</title>
10-
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=362ab14a" />
9+
<title>Git Cola 4.7.0 documentation</title>
10+
<link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
1111
<link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=135e06be" />
1212
<link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=36a5483c" />
1313

@@ -123,7 +123,7 @@
123123
</label>
124124
</div>
125125
<div class="header-center">
126-
<a href="#"><div class="brand">Git Cola 4.6.1 documentation</div></a>
126+
<a href="#"><div class="brand">Git Cola 4.7.0 documentation</div></a>
127127
</div>
128128
<div class="header-right">
129129
<div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
146146
<div class="sidebar-sticky"><a class="sidebar-brand" href="#">
147147

148148

149-
<span class="sidebar-brand-text">Git Cola 4.6.1 documentation</span>
149+
<span class="sidebar-brand-text">Git Cola 4.7.0 documentation</span>
150150

151151
</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
152152
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -298,6 +298,7 @@ <h1>Git Cola Documentation<a class="headerlink" href="#git-cola-documentation" t
298298
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-startupmode">cola.startupmode</a></li>
299299
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-statusindent">cola.statusindent</a></li>
300300
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-statusshowtotals">cola.statusshowtotals</a></li>
301+
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-sync">cola.sync</a></li>
301302
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-tabwidth">cola.tabwidth</a></li>
302303
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-terminal">cola.terminal</a></li>
303304
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-terminalshellquote">cola.terminalshellquote</a></li>
@@ -395,6 +396,7 @@ <h2>Release Notes<a class="headerlink" href="#release-notes" title="Link to this
395396
<li class="toctree-l1"><a class="reference internal" href="relnotes.html">Releases</a><ul>
396397
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#latest-release">Latest Release</a></li>
397398
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#development-version">Development version</a></li>
399+
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-7-0">v4.7.0</a></li>
398400
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-6-1">v4.6.1</a></li>
399401
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-6-0">v4.6.0</a></li>
400402
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-5-0">v4.5.0</a></li>
@@ -568,7 +570,7 @@ <h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Li
568570

569571
</aside>
570572
</div>
571-
</div><script src="static/documentation_options.js?v=68f2c66a"></script>
573+
</div><script src="static/documentation_options.js?v=bd5f082a"></script>
572574
<script src="static/doctools.js?v=888ff710"></script>
573575
<script src="static/sphinx_highlight.js?v=dc90522c"></script>
574576
<script src="static/scripts/furo.js?v=32e29ea5"></script>

0 commit comments

Comments
 (0)