Skip to content

Commit 5ad07f7

Browse files
ByronByron
committed
Merge branch 'master' into teeberg-master
Need latest master to proceed with test Conflicts: doc/source/tutorial.rst
2 parents 2ce3fe7 + 1410bcc commit 5ad07f7

20 files changed

+604
-343
lines changed

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Then run:
5050

5151
GitPython's git repo is available on GitHub, which can be browsed at [github](https://github.com/gitpython-developers/GitPython) and cloned like that:
5252

53-
git clone git://github.com/gitpython-developers/GitPython.git git-python
53+
git clone https://github.com/gitpython-developers/GitPython
5454

5555
### Live Coding
5656

Diff for: ‎doc/source/changes.rst

+11-8
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,22 @@ Changelog
44

55
0.3.6 - Features
66
================
7-
* Added `Repo.merge_base()` implementation. See the `respective issue on github <https://github.com/gitpython-developers/GitPython/issues/169>`_
8-
* `[include]` sections in git configuration files are now respected
9-
* Added `GitConfigParser.rename_section()`
10-
* DOCS: special members like `__init__` are now listed in the API documentation
11-
* DOCS: tutorial section was revised entirely
12-
* Added `Submodule.rename()`
7+
* **DOCS**
8+
9+
* special members like `__init__` are now listed in the API documentation
10+
* tutorial section was revised entirely, more advanced examples were added.
11+
1312
* **POSSIBLY BREAKING CHANGES**
1413

1514
* As `rev_parse` will now throw `BadName` as well as `BadObject`, client code will have to catch both exception types.
1615
* Repo.working_tree_dir now returns None if it is bare. Previously it raised AssertionError.
1716
* IndexFile.add() previously raised AssertionError when paths where used with bare repository, now it raises InvalidGitRepositoryError
18-
19-
* A list of all issues can be found here: https://github.com/gitpython-developers/GitPython/issues?q=milestone%3A%22v0.3.6+-+Features%22+
17+
18+
* Added `Repo.merge_base()` implementation. See the `respective issue on github <https://github.com/gitpython-developers/GitPython/issues/169>`_
19+
* `[include]` sections in git configuration files are now respected
20+
* Added `GitConfigParser.rename_section()`
21+
* Added `Submodule.rename()`
22+
* A list of all issues can be found `on github <https://github.com/gitpython-developers/GitPython/issues?q=milestone%3A%22v0.3.6+-+Features%22+>`_
2023

2124
0.3.5 - Bugfixes
2225
================

Diff for: ‎doc/source/reference.rst

+25-1
Original file line numberDiff line numberDiff line change
@@ -33,105 +33,119 @@ Objects.Tag
3333
.. automodule:: git.objects.tag
3434
:members:
3535
:undoc-members:
36+
:special-members:
3637

3738
Objects.Tree
3839
------------
3940

4041
.. automodule:: git.objects.tree
4142
:members:
4243
:undoc-members:
44+
:special-members:
4345

4446
Objects.Functions
4547
-----------------
4648

4749
.. automodule:: git.objects.fun
4850
:members:
4951
:undoc-members:
52+
:special-members:
5053

5154
Objects.Submodule.base
5255
----------------------
5356

5457
.. automodule:: git.objects.submodule.base
5558
:members:
5659
:undoc-members:
60+
:special-members:
5761

5862
Objects.Submodule.root
5963
----------------------
6064

6165
.. automodule:: git.objects.submodule.root
6266
:members:
6367
:undoc-members:
68+
:special-members:
6469

6570
Objects.Submodule.util
6671
----------------------
6772

6873
.. automodule:: git.objects.submodule.util
6974
:members:
7075
:undoc-members:
76+
:special-members:
7177

7278
Objects.Util
7379
-------------
7480

7581
.. automodule:: git.objects.util
7682
:members:
7783
:undoc-members:
84+
:special-members:
7885

7986
Index.Base
8087
----------
8188

8289
.. automodule:: git.index.base
8390
:members:
8491
:undoc-members:
92+
:special-members:
8593

8694
Index.Functions
8795
---------------
8896

8997
.. automodule:: git.index.fun
9098
:members:
9199
:undoc-members:
100+
:special-members:
92101

93102
Index.Types
94103
-----------
95104

96105
.. automodule:: git.index.typ
97106
:members:
98107
:undoc-members:
108+
:special-members:
99109

100110
Index.Util
101111
-------------
102112

103113
.. automodule:: git.index.util
104114
:members:
105115
:undoc-members:
116+
:special-members:
106117

107118
GitCmd
108119
------
109120

110121
.. automodule:: git.cmd
111122
:members:
112123
:undoc-members:
113-
124+
:special-members:
114125

115126
Config
116127
------
117128

118129
.. automodule:: git.config
119130
:members:
120131
:undoc-members:
132+
:special-members:
121133

122134
Diff
123135
----
124136

125137
.. automodule:: git.diff
126138
:members:
127139
:undoc-members:
140+
:special-members:
128141

129142
Exceptions
130143
----------
131144

132145
.. automodule:: git.exc
133146
:members:
134147
:undoc-members:
148+
:special-members:
135149

136150

137151
Refs.symbolic
@@ -140,66 +154,76 @@ Refs.symbolic
140154
.. automodule:: git.refs.symbolic
141155
:members:
142156
:undoc-members:
157+
:special-members:
143158

144159
Refs.reference
145160
--------------
146161

147162
.. automodule:: git.refs.reference
148163
:members:
149164
:undoc-members:
165+
:special-members:
150166

151167
Refs.head
152168
---------
153169

154170
.. automodule:: git.refs.head
155171
:members:
156172
:undoc-members:
173+
:special-members:
157174

158175
Refs.tag
159176
------------
160177

161178
.. automodule:: git.refs.tag
162179
:members:
163180
:undoc-members:
181+
:special-members:
164182

165183
Refs.remote
166184
------------
167185

168186
.. automodule:: git.refs.remote
169187
:members:
170188
:undoc-members:
189+
:special-members:
171190

172191
Refs.log
173192
------------
174193

175194
.. automodule:: git.refs.log
176195
:members:
177196
:undoc-members:
197+
:special-members:
178198

179199
Remote
180200
------
181201

182202
.. automodule:: git.remote
183203
:members:
184204
:undoc-members:
205+
:special-members:
185206

186207
Repo.Base
187208
---------
188209

189210
.. automodule:: git.repo.base
190211
:members:
191212
:undoc-members:
213+
:special-members:
192214

193215
Repo.Functions
194216
--------------
195217

196218
.. automodule:: git.repo.fun
197219
:members:
198220
:undoc-members:
221+
:special-members:
199222

200223
Util
201224
----
202225

203226
.. automodule:: git.util
204227
:members:
205228
:undoc-members:
229+
:special-members:

0 commit comments

Comments
 (0)