Commit5ad07f7

committed

Merge branch 'master' into teeberg-master

Need latest master to proceed with testConflicts:doc/source/tutorial.rst

2 parents2ce3fe7 +1410bcc commit5ad07f7Copy full SHA for 5ad07f7

File tree

20 files changed

+604

-343

lines changed

README.md
doc/source
git
- cmd.py
- diff.py
- ext
  - gitdb
- index
  - typ.py
- objects/submodule
  - base.py
- refs
  - symbolic.py
- remote.py
- repo
  - base.py
  - fun.py
- test

20 files changed

+604

-343

lines changed

`‎README.md`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ Then run:`
`50`	`50`
`51`	`51`	`GitPython's git repo is available on GitHub, which can be browsed at[github](https://github.com/gitpython-developers/GitPython) and cloned like that:`
`52`	`52`
`53`		`-git clonegit://github.com/gitpython-developers/GitPython.git git-python`
	`53`	`+git clonehttps://github.com/gitpython-developers/GitPython`
`54`	`54`
`55`	`55`	`###Live Coding`
`56`	`56`

`‎doc/source/changes.rst`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,22 @@ Changelog`
`4`	`4`
`5`	`5`	`0.3.6 - Features`
`6`	`6`	`================`
`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`	`+`
`13`	`12`	`* POSSIBLY BREAKING CHANGES`
`14`	`13`
`15`	`14`	* As `rev_parse` will now throw `BadName` as well as `BadObject`, client code will have to catch both exception types.
`16`	`15`	`* Repo.working_tree_dir now returns None if it is bare. Previously it raised AssertionError.`
`17`	`16`	`* 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+>`_
`20`	`23`
`21`	`24`	`0.3.5 - Bugfixes`
`22`	`25`	`================`

`‎doc/source/reference.rst`

Lines changed: 25 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,105 +33,119 @@ Objects.Tag`
`33`	`33`	`..automodule::git.objects.tag`
`34`	`34`	`:members:`
`35`	`35`	`:undoc-members:`
	`36`	`+:special-members:`
`36`	`37`
`37`	`38`	`Objects.Tree`
`38`	`39`	`------------`
`39`	`40`
`40`	`41`	`..automodule::git.objects.tree`
`41`	`42`	`:members:`
`42`	`43`	`:undoc-members:`
	`44`	`+:special-members:`
`43`	`45`
`44`	`46`	`Objects.Functions`
`45`	`47`	`-----------------`
`46`	`48`
`47`	`49`	`..automodule::git.objects.fun`
`48`	`50`	`:members:`
`49`	`51`	`:undoc-members:`
	`52`	`+:special-members:`
`50`	`53`
`51`	`54`	`Objects.Submodule.base`
`52`	`55`	`----------------------`
`53`	`56`
`54`	`57`	`..automodule::git.objects.submodule.base`
`55`	`58`	`:members:`
`56`	`59`	`:undoc-members:`
	`60`	`+:special-members:`
`57`	`61`
`58`	`62`	`Objects.Submodule.root`
`59`	`63`	`----------------------`
`60`	`64`
`61`	`65`	`..automodule::git.objects.submodule.root`
`62`	`66`	`:members:`
`63`	`67`	`:undoc-members:`
	`68`	`+:special-members:`
`64`	`69`
`65`	`70`	`Objects.Submodule.util`
`66`	`71`	`----------------------`
`67`	`72`
`68`	`73`	`..automodule::git.objects.submodule.util`
`69`	`74`	`:members:`
`70`	`75`	`:undoc-members:`
	`76`	`+:special-members:`
`71`	`77`
`72`	`78`	`Objects.Util`
`73`	`79`	`-------------`
`74`	`80`
`75`	`81`	`..automodule::git.objects.util`
`76`	`82`	`:members:`
`77`	`83`	`:undoc-members:`
	`84`	`+:special-members:`
`78`	`85`
`79`	`86`	`Index.Base`
`80`	`87`	`----------`
`81`	`88`
`82`	`89`	`..automodule::git.index.base`
`83`	`90`	`:members:`
`84`	`91`	`:undoc-members:`
	`92`	`+:special-members:`
`85`	`93`
`86`	`94`	`Index.Functions`
`87`	`95`	`---------------`
`88`	`96`
`89`	`97`	`..automodule::git.index.fun`
`90`	`98`	`:members:`
`91`	`99`	`:undoc-members:`
	`100`	`+:special-members:`
`92`	`101`
`93`	`102`	`Index.Types`
`94`	`103`	`-----------`
`95`	`104`
`96`	`105`	`..automodule::git.index.typ`
`97`	`106`	`:members:`
`98`	`107`	`:undoc-members:`
	`108`	`+:special-members:`
`99`	`109`
`100`	`110`	`Index.Util`
`101`	`111`	`-------------`
`102`	`112`
`103`	`113`	`..automodule::git.index.util`
`104`	`114`	`:members:`
`105`	`115`	`:undoc-members:`
	`116`	`+:special-members:`
`106`	`117`
`107`	`118`	`GitCmd`
`108`	`119`	`------`
`109`	`120`
`110`	`121`	`..automodule::git.cmd`
`111`	`122`	`:members:`
`112`	`123`	`:undoc-members:`
`113`		`-`
	`124`	`+:special-members:`
`114`	`125`
`115`	`126`	`Config`
`116`	`127`	`------`
`117`	`128`
`118`	`129`	`..automodule::git.config`
`119`	`130`	`:members:`
`120`	`131`	`:undoc-members:`
	`132`	`+:special-members:`
`121`	`133`
`122`	`134`	`Diff`
`123`	`135`	`----`
`124`	`136`
`125`	`137`	`..automodule::git.diff`
`126`	`138`	`:members:`
`127`	`139`	`:undoc-members:`
	`140`	`+:special-members:`
`128`	`141`
`129`	`142`	`Exceptions`
`130`	`143`	`----------`
`131`	`144`
`132`	`145`	`..automodule::git.exc`
`133`	`146`	`:members:`
`134`	`147`	`:undoc-members:`
	`148`	`+:special-members:`
`135`	`149`
`136`	`150`
`137`	`151`	`Refs.symbolic`
`@@ -140,66 +154,76 @@ Refs.symbolic`
`140`	`154`	`..automodule::git.refs.symbolic`
`141`	`155`	`:members:`
`142`	`156`	`:undoc-members:`
	`157`	`+:special-members:`
`143`	`158`
`144`	`159`	`Refs.reference`
`145`	`160`	`--------------`
`146`	`161`
`147`	`162`	`..automodule::git.refs.reference`
`148`	`163`	`:members:`
`149`	`164`	`:undoc-members:`
	`165`	`+:special-members:`
`150`	`166`
`151`	`167`	`Refs.head`
`152`	`168`	`---------`
`153`	`169`
`154`	`170`	`..automodule::git.refs.head`
`155`	`171`	`:members:`
`156`	`172`	`:undoc-members:`
	`173`	`+:special-members:`
`157`	`174`
`158`	`175`	`Refs.tag`
`159`	`176`	`------------`
`160`	`177`
`161`	`178`	`..automodule::git.refs.tag`
`162`	`179`	`:members:`
`163`	`180`	`:undoc-members:`
	`181`	`+:special-members:`
`164`	`182`
`165`	`183`	`Refs.remote`
`166`	`184`	`------------`
`167`	`185`
`168`	`186`	`..automodule::git.refs.remote`
`169`	`187`	`:members:`
`170`	`188`	`:undoc-members:`
	`189`	`+:special-members:`
`171`	`190`
`172`	`191`	`Refs.log`
`173`	`192`	`------------`
`174`	`193`
`175`	`194`	`..automodule::git.refs.log`
`176`	`195`	`:members:`
`177`	`196`	`:undoc-members:`
	`197`	`+:special-members:`
`178`	`198`
`179`	`199`	`Remote`
`180`	`200`	`------`
`181`	`201`
`182`	`202`	`..automodule::git.remote`
`183`	`203`	`:members:`
`184`	`204`	`:undoc-members:`
	`205`	`+:special-members:`
`185`	`206`
`186`	`207`	`Repo.Base`
`187`	`208`	`---------`
`188`	`209`
`189`	`210`	`..automodule::git.repo.base`
`190`	`211`	`:members:`
`191`	`212`	`:undoc-members:`
	`213`	`+:special-members:`
`192`	`214`
`193`	`215`	`Repo.Functions`
`194`	`216`	`--------------`
`195`	`217`
`196`	`218`	`..automodule::git.repo.fun`
`197`	`219`	`:members:`
`198`	`220`	`:undoc-members:`
	`221`	`+:special-members:`
`199`	`222`
`200`	`223`	`Util`
`201`	`224`	`----`
`202`	`225`
`203`	`226`	`..automodule::git.util`
`204`	`227`	`:members:`
`205`	`228`	`:undoc-members:`
	`229`	`+:special-members:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5ad07f7

File tree

20 files changed

20 files changed

`‎README.md`

`‎doc/source/changes.rst`

`‎doc/source/reference.rst`

0 commit comments