Skip to content

Commit 9df94ac

Browse files
davviddavvid
committed
git-cola v4.3.0
1 parent c480b3f commit 9df94ac

30 files changed

+14854
-14791
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.2.1"
12-
cola_release_date: "2023-03-31"
11+
cola_version: "4.3.0"
12+
cola_release_date: "2023-08-12"
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: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,13 @@ Defaults to `true`. This setting is configured using the `Preferences`
762762
dialog, but it can be toggled for one-off usage using the commit message
763763
editor's options sub-menu.
764764

765+
cola.logdate
766+
------------
767+
Set the default date-time mode for the DAG display. This value is
768+
passed to `git log --date=<format>`.
769+
See `git log(1) <https://git-scm.com/docs/git-log#Documentation/git-log.txt---dateltformatgt>`_
770+
for more details.
771+
765772
cola.maxrecent
766773
--------------
767774
`git cola` caps the number of recent repositories to avoid cluttering
@@ -793,6 +800,12 @@ cola.resizebrowsercolumns
793800
`git cola` will automatically resize the file browser columns as folders are
794801
expanded/collapsed when ``cola.resizebrowsercolumns`` is set to `true`.
795802

803+
cola.patchesdirectory
804+
---------------------
805+
The default directory to use when exporting patches. Relative paths are treated
806+
as being relative to the current repository. Absolute paths are used as-is.
807+
Defaults to `patches`.
808+
796809
cola.safemode
797810
-------------
798811
The "Stage" button in the `git cola` Actions panel stages all files when it is
@@ -1219,6 +1232,17 @@ prior to launching `git cola`.::
12191232
eval $(gpg-agent --daemon)
12201233
git cola
12211234

1235+
SHELL COMPLETIONS
1236+
=================
1237+
1238+
Git Cola provides shell completions for zsh and bash.
1239+
The completion scripts and instructions are included in Git Cola's
1240+
`contrib` directory.
1241+
1242+
* `Shell completion scripts <https://gitlab.com/git-cola/git-cola/-/tree/main/contrib>`_
1243+
1244+
* `Setup instructions <https://gitlab.com/git-cola/git-cola/-/blob/main/contrib/README.md>`_
1245+
12221246
WINDOWS NOTES
12231247
=============
12241248

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6-
<title>Index &mdash; git-cola 4.2.1 documentation</title>
6+
<title>Index &mdash; git-cola 4.3.0 documentation</title>
77
<link rel="stylesheet" href="static/pygments.css" type="text/css" />
88
<link rel="stylesheet" href="static/css/theme.css" type="text/css" />
99
<!--[if lt IE 9]>
@@ -13,9 +13,7 @@
1313
<script data-url_root="./" id="documentation_options" src="static/documentation_options.js"></script>
1414
<script src="static/jquery.js"></script>
1515
<script src="static/underscore.js"></script>
16-
<script src="static/_sphinx_javascript_frameworks_compat.js"></script>
1716
<script src="static/doctools.js"></script>
18-
<script src="static/sphinx_highlight.js"></script>
1917
<script src="static/js/theme.js"></script>
2018
<link rel="index" title="Index" href="#" />
2119
<link rel="search" title="Search" href="search.html" />
@@ -33,7 +31,7 @@
3331
git-cola
3432
</a>
3533
<div class="version">
36-
4.2.1
34+
4.3.0
3735
</div>
3836
<div role="search">
3937
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">

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

Lines changed: 182 additions & 153 deletions
Large diffs are not rendered by default.

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

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!DOCTYPE html>
22
<html class="writer-html5" lang="en" >
33
<head>
4-
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
4+
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
55

66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>git-dag(1) &mdash; git-cola 4.2.1 documentation</title>
7+
<title>git-dag(1) &mdash; git-cola 4.3.0 documentation</title>
88
<link rel="stylesheet" href="static/pygments.css" type="text/css" />
99
<link rel="stylesheet" href="static/css/theme.css" type="text/css" />
1010
<!--[if lt IE 9]>
@@ -14,9 +14,7 @@
1414
<script data-url_root="./" id="documentation_options" src="static/documentation_options.js"></script>
1515
<script src="static/jquery.js"></script>
1616
<script src="static/underscore.js"></script>
17-
<script src="static/_sphinx_javascript_frameworks_compat.js"></script>
1817
<script src="static/doctools.js"></script>
19-
<script src="static/sphinx_highlight.js"></script>
2018
<script src="static/js/theme.js"></script>
2119
<link rel="index" title="Index" href="genindex.html" />
2220
<link rel="search" title="Search" href="search.html" />
@@ -36,7 +34,7 @@
3634
git-cola
3735
</a>
3836
<div class="version">
39-
4.2.1
37+
4.3.0
4038
</div>
4139
<div role="search">
4240
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
@@ -99,67 +97,67 @@
9997
<div itemprop="articleBody">
10098

10199
<section id="git-dag-1">
102-
<h1>git-dag(1)<a class="headerlink" href="#git-dag-1" title="Permalink to this heading"></a></h1>
100+
<h1>git-dag(1)<a class="headerlink" href="#git-dag-1" title="Permalink to this headline"></a></h1>
103101
<section id="synopsis">
104-
<h2>SYNOPSIS<a class="headerlink" href="#synopsis" title="Permalink to this heading"></a></h2>
102+
<h2>SYNOPSIS<a class="headerlink" href="#synopsis" title="Permalink to this headline"></a></h2>
105103
<p>git dag [options] [&lt;since&gt;..&lt;until&gt;] [[–] [&lt;path&gt;…]]</p>
106104
</section>
107105
<section id="description">
108-
<h2>DESCRIPTION<a class="headerlink" href="#description" title="Permalink to this heading"></a></h2>
106+
<h2>DESCRIPTION<a class="headerlink" href="#description" title="Permalink to this headline"></a></h2>
109107
<p><cite>git-dag</cite> is a powerful Git history visualizer.
110108
<cite>git-dag</cite> presents powerful <cite>git log</cite> features in a simple-to-use
111109
graphical interface.</p>
112110
</section>
113111
<section id="options">
114-
<h2>OPTIONS<a class="headerlink" href="#options" title="Permalink to this heading"></a></h2>
112+
<h2>OPTIONS<a class="headerlink" href="#options" title="Permalink to this headline"></a></h2>
115113
<section id="prompt">
116-
<h3>–prompt<a class="headerlink" href="#prompt" title="Permalink to this heading"></a></h3>
114+
<h3>–prompt<a class="headerlink" href="#prompt" title="Permalink to this headline"></a></h3>
117115
<p>Prompt for a Git repository instead of using the current directory.</p>
118116
</section>
119117
<section id="r-repo-path">
120-
<h3>-r, –repo &lt;path&gt;<a class="headerlink" href="#r-repo-path" title="Permalink to this heading"></a></h3>
118+
<h3>-r, –repo &lt;path&gt;<a class="headerlink" href="#r-repo-path" title="Permalink to this headline"></a></h3>
121119
<p>Run <cite>git dag</cite> on the git repository in <cite>&lt;path&gt;</cite>.
122120
Defaults to the current directory.</p>
123121
</section>
124122
<section id="version">
125-
<h3>–version<a class="headerlink" href="#version" title="Permalink to this heading"></a></h3>
123+
<h3>–version<a class="headerlink" href="#version" title="Permalink to this headline"></a></h3>
126124
<p>Print the <cite>git dag</cite> version and exit.</p>
127125
</section>
128126
<section id="h-help">
129-
<h3>-h, –help<a class="headerlink" href="#h-help" title="Permalink to this heading"></a></h3>
127+
<h3>-h, –help<a class="headerlink" href="#h-help" title="Permalink to this headline"></a></h3>
130128
<p>Show usage and optional arguments.</p>
131129
</section>
132130
</section>
133131
<section id="log-options">
134-
<h2>Log Options<a class="headerlink" href="#log-options" title="Permalink to this heading"></a></h2>
132+
<h2>Log Options<a class="headerlink" href="#log-options" title="Permalink to this headline"></a></h2>
135133
<p>The <cite>Log</cite> prompt allows you to pass arguments to <cite>git log</cite>.
136134
This can be used to filter the displayed history, for example
137135
entering <cite>main – Makefile</cite> will display only commits on the
138136
<cite>main</cite> branch that touch the <cite>Makefile</cite>.</p>
139137
</section>
140138
<section id="context-menu-actions">
141-
<h2>CONTEXT-MENU ACTIONS<a class="headerlink" href="#context-menu-actions" title="Permalink to this heading"></a></h2>
139+
<h2>CONTEXT-MENU ACTIONS<a class="headerlink" href="#context-menu-actions" title="Permalink to this headline"></a></h2>
142140
<p>The right-click menu can be used to perform various actions.
143141
All actions operate on the selected commit.</p>
144142
<p>You can create branches and tags, cherry-pick commits, save patches,
145143
export tarballs, and grab files from older commits using the context menu.</p>
146144
</section>
147145
<section id="diff-commits">
148-
<h2>DIFF COMMITS<a class="headerlink" href="#diff-commits" title="Permalink to this heading"></a></h2>
146+
<h2>DIFF COMMITS<a class="headerlink" href="#diff-commits" title="Permalink to this headline"></a></h2>
149147
<p>You can diff arbitrary commits. Select a single commit in either the list
150148
view or the graph view and then right-click on a second commit.</p>
151149
<p>A menu will appear allowing you to diff the two commits.</p>
152150
</section>
153151
<section id="shortcuts">
154-
<h2>SHORTCUTS<a class="headerlink" href="#shortcuts" title="Permalink to this heading"></a></h2>
152+
<h2>SHORTCUTS<a class="headerlink" href="#shortcuts" title="Permalink to this headline"></a></h2>
155153
<p>You can run commands using dedicated shortcuts. Select a single commit
156154
and then press <cite>Ctrl-Alt-c</cite> to copy sha1 or <cite>Ctrl-d</cite> to run diff tool.</p>
157155
<p>You can read more about hotkeys from ‘keyboard shortcuts’ window or context menu.</p>
158156
</section>
159157
<section id="configuration-variables">
160-
<h2>CONFIGURATION VARIABLES<a class="headerlink" href="#configuration-variables" title="Permalink to this heading"></a></h2>
158+
<h2>CONFIGURATION VARIABLES<a class="headerlink" href="#configuration-variables" title="Permalink to this headline"></a></h2>
161159
<section id="log-date">
162-
<h3>log.date<a class="headerlink" href="#log-date" title="Permalink to this heading"></a></h3>
160+
<h3>log.date<a class="headerlink" href="#log-date" title="Permalink to this headline"></a></h3>
163161
<p>Set the default date-time format for the ‘Date’ field.
164162
Setting a value for log.date is similar to using <cite>git log</cite>’s
165163
<cite>–date</cite> option. Possible values are <cite>relative</cite>, <cite>local</cite>,

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!DOCTYPE html>
22
<html class="writer-html5" lang="en" >
33
<head>
4-
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
4+
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
55

66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Git Cola Documentation &mdash; git-cola 4.2.1 documentation</title>
7+
<title>Git Cola Documentation &mdash; git-cola 4.3.0 documentation</title>
88
<link rel="stylesheet" href="static/pygments.css" type="text/css" />
99
<link rel="stylesheet" href="static/css/theme.css" type="text/css" />
1010
<!--[if lt IE 9]>
@@ -14,9 +14,7 @@
1414
<script data-url_root="./" id="documentation_options" src="static/documentation_options.js"></script>
1515
<script src="static/jquery.js"></script>
1616
<script src="static/underscore.js"></script>
17-
<script src="static/_sphinx_javascript_frameworks_compat.js"></script>
1817
<script src="static/doctools.js"></script>
19-
<script src="static/sphinx_highlight.js"></script>
2018
<script src="static/js/theme.js"></script>
2119
<link rel="index" title="Index" href="genindex.html" />
2220
<link rel="search" title="Search" href="search.html" />
@@ -35,7 +33,7 @@
3533
git-cola
3634
</a>
3735
<div class="version">
38-
4.2.1
36+
4.3.0
3937
</div>
4038
<div role="search">
4139
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
@@ -79,7 +77,7 @@
7977
<div itemprop="articleBody">
8078

8179
<section id="git-cola-documentation">
82-
<h1>Git Cola Documentation<a class="headerlink" href="#git-cola-documentation" title="Permalink to this heading"></a></h1>
80+
<h1>Git Cola Documentation<a class="headerlink" href="#git-cola-documentation" title="Permalink to this headline"></a></h1>
8381
<div class="toctree-wrapper compound">
8482
<ul>
8583
<li class="toctree-l1"><a class="reference internal" href="git-cola.html">git-cola(1)</a><ul>
@@ -167,11 +165,13 @@ <h1>Git Cola Documentation<a class="headerlink" href="#git-cola-documentation" t
167165
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-inotify">cola.inotify</a></li>
168166
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-refreshonfocus">cola.refreshonfocus</a></li>
169167
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-linebreak">cola.linebreak</a></li>
168+
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-logdate">cola.logdate</a></li>
170169
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-maxrecent">cola.maxrecent</a></li>
171170
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-mousezoom">cola.mousezoom</a></li>
172171
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-dragencoding">cola.dragencoding</a></li>
173172
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-readsize">cola.readsize</a></li>
174173
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-resizebrowsercolumns">cola.resizebrowsercolumns</a></li>
174+
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-patchesdirectory">cola.patchesdirectory</a></li>
175175
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-safemode">cola.safemode</a></li>
176176
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-savewindowsettings">cola.savewindowsettings</a></li>
177177
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-showpath">cola.showpath</a></li>
@@ -228,6 +228,7 @@ <h1>Git Cola Documentation<a class="headerlink" href="#git-cola-documentation" t
228228
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#configure-gpg-agent-and-a-pin-entry-program">Configure gpg-agent and a pin-entry program</a></li>
229229
</ul>
230230
</li>
231+
<li class="toctree-l2"><a class="reference internal" href="git-cola.html#shell-completions">SHELL COMPLETIONS</a></li>
231232
<li class="toctree-l2"><a class="reference internal" href="git-cola.html#windows-notes">WINDOWS NOTES</a><ul>
232233
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#git-installation">Git Installation</a></li>
233234
<li class="toctree-l3"><a class="reference internal" href="git-cola.html#ssh-agents-for-key-based-authentication">SSH Agents for Key-based Authentication</a></li>
@@ -266,12 +267,13 @@ <h1>Git Cola Documentation<a class="headerlink" href="#git-cola-documentation" t
266267
</ul>
267268
</div>
268269
<section id="release-notes">
269-
<h2>Release Notes<a class="headerlink" href="#release-notes" title="Permalink to this heading"></a></h2>
270+
<h2>Release Notes<a class="headerlink" href="#release-notes" title="Permalink to this headline"></a></h2>
270271
<div class="toctree-wrapper compound">
271272
<ul>
272273
<li class="toctree-l1"><a class="reference internal" href="relnotes.html">Releases</a><ul>
273274
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#latest-release">Latest Release</a></li>
274275
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#development-version">Development version</a></li>
276+
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-3-0">v4.3.0</a></li>
275277
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-2-1">v4.2.1</a></li>
276278
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-2-0">v4.2.0</a></li>
277279
<li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-1-0">v4.1.0</a></li>
@@ -370,7 +372,7 @@ <h2>Release Notes<a class="headerlink" href="#release-notes" title="Permalink to
370372
</div>
371373
</section>
372374
<section id="indices-and-tables">
373-
<h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this heading"></a></h2>
375+
<h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline"></a></h2>
374376
<ul class="simple">
375377
<li><p><a class="reference internal" href="genindex.html"><span class="std std-ref">Index</span></a></p></li>
376378
<li><p><a class="reference internal" href="search.html"><span class="std std-ref">Search Page</span></a></p></li>

‎share/doc/git-cola/html/objects.inv‎

5 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)