summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'neeraju-patch-1'experiment-2012Sebastian Thiel2014-11-191-2/+1
|\
| * Merge branch 'patch-1' of https://github.com/neeraju/GitPython into ↵Sebastian Thiel2014-11-191-2/+1
| |\ |/ / | | | | | | | | | | neeraju-patch-1 Conflicts: git/objects/submodule/base.py
| * Update base.pyneeraju2013-08-181-1/+1
| |
* | Merge branch 'moshevds-master'Sebastian Thiel2014-11-172-54/+99
|\ \
| * | Fixed indentation errorSebastian Thiel2014-11-171-1/+1
| | |
| * | Fixed regression that would possibly have caused an abundance of chdir calls.Sebastian Thiel2014-11-171-9/+13
| | |
| * | Merge branch 'master' of https://github.com/moshevds/GitPython into ↵Sebastian Thiel2014-11-172-49/+90
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | moshevds-master Fixed an issue with path_rewriter code branch, but there is more to do Conflicts: git/index/base.py git/test/test_index.py
| * | Refactored the working tree dependent code for add.Môshe van der Sterre2013-12-311-40/+44
| | | | | | | | | | | | | | | Adding to a bare repository is now possible because @git_working_dir is only used on the relevant methods.
| * | Test if it is possible to add files to the index of a bare repo.Môshe van der Sterre2013-12-311-0/+34
| |/ | | | | | | Adding using a path should still require a non-bare repository.
* | Added deprecation warning to master branchSebastian Thiel2014-11-141-68/+6
| |
* | Merge pull request #190 from jean/masterSebastian Thiel2014-11-141-2/+3
|\ \ | | | | | | Add missing requirements
| * | Add missing requirementsJean Jordaan2014-09-151-2/+3
| | |
* | | Merge pull request #192 from maxyz/masterSebastian Thiel2014-11-141-1/+1
|\ \ \ | | | | | | | | test_fetch_info error, FETCH_HEAD uses tabs
| * | | test_fetch_info error, FETCH_HEAD uses tabsMaximiliano Curia2014-09-291-1/+1
| |/ /
* | | Merge pull request #193 from maxyz/fix-issue-41_masterSebastian Thiel2014-11-141-2/+2
|\ \ \ | |/ / |/| | Fix issue #41: repo.is_dirty() on empty repository with stashed files
| * | Fix issue #41: repo.is_dirty() on empty repository with stashed filesJan Vcelak2014-09-291-2/+2
|/ /
* | Merge pull request #187 from tsheibar/masterSebastian Thiel2014-09-021-1/+1
|\ \ | | | | | | Fixing issue #186: 'tuple index out of range' issue when uploading to private Pypi repository
| * | Fixing 'tuple index out of range' issue with distutils/command/upload.py ↵Ted Sheibar2014-08-191-1/+1
|/ / | | | | | | (v2.7.7): the 'requires' field tuple should be a list(https://github.com/gitpython-developers/GitPython/issues/186)
* | Merge pull request #183 from kmosher/masterSebastian Thiel2014-08-173-54/+73
|\ \ | | | | | | Update the config parser using code from python2.7
| * | Update the config parser using code from python2.7Keith Mosher2014-08-123-54/+73
| | | | | | | | | | | | | | | | | | Notably this adds support for valueless options ( e.x. the option "required" which can be added to filters which must succeed.)
* | | Merge pull request #184 from SurveyMonkey/GH-145_fix_git_push_hangSebastian Thiel2014-08-171-3/+3
|\ \ \ | |/ / |/| | Fix `git push` hanging when stdout/stderr is big
| * | Fix `git push` hanging when stdout/stderr is bigMarc Abramowitz2014-08-131-3/+3
|/ / | | | | | | Fixes GH-145
* | Merge pull request #173 from craigez/feature/pep8Sebastian Thiel2014-07-25115-5028/+5387
|\ \ | | | | | | Autopep8 style whitespace cleanups & pre-commit hook
| * | Autopep8 fixes with maximum line length 120Craig Northway2014-07-25115-5028/+5387
|/ /
* | Merge pull request #175 from craigez/feature/handle_utf8Sebastian Thiel2014-07-252-12/+24
|\ \ | | | | | | Handling unicode arguments
| * | Basic test for __unpack_args to verify unicode handling worksCraig Northway2014-07-251-12/+20
| | |
| * | Fixing unicode typesCraig Northway2014-07-181-0/+4
| | |
* | | Merge pull request #176 from craigez/feature/file_closingSebastian Thiel2014-07-252-14/+26
|\ \ \ | |/ / |/| | Closing file handles/streams
| * | Closing file handles/streamsCraig Northway2014-07-252-14/+26
|/ /
* | Merge pull request #159 from maxyz/masterSebastian Thiel2014-05-061-15/+14
|\ \ | | | | | | Fix for untracked_files no longer detected #138
| * | Fix for untracked_files no longer detected #138Maximiliano Curia2014-05-061-15/+14
|/ /
* | Merge pull request #116 from lqez/masterSebastian Thiel2014-04-071-2/+2
|\ \ | | | | | | Fix typo in tutorial
| * | Fix typo in tutorialPark Hyunwoo2013-07-301-2/+2
| |/
* | Merge branch 'feature/spaces-and-cleanup-master'Sebastian Thiel2014-02-10108-20084/+20088
|\ \ | |/ |/| | | | | | | | | * feature/spaces-and-cleanup-master: Basic fixes to get tests back on track. Of course there is much more work to be done here removed leftover gitdb - I thought it was merged into git tabs to 4 spaces - overall state of this branch is desolate, but fixable. Needs plenty of work
| * Basic fixes to get tests back on track. Of course there is much more work to ↵Sebastian Thiel2014-02-1010-18/+22
| | | | | | | | be done here
| * removed leftover gitdb - I thought it was merged into gitSebastian Thiel2014-02-101-0/+0
| |
| * tabs to 4 spaces - overall state of this branch is desolate, but fixable. ↵Sebastian Thiel2014-02-09106-20082/+20082
|/ | | | Needs plenty of work
* Merge pull request #103 from esc/fixup/readmeSebastian Thiel2013-03-261-7/+13
|\ | | | | Fixup/readme
| * remove indentation for linkValentin Haenel2013-03-261-1/+1
| |
| * proper synatx highlighting for shell commandsValentin Haenel2013-03-261-3/+9
| |
| * strip trailing whitespaceValentin Haenel2013-03-261-3/+3
| |
* | Merge pull request #104 from esc/fixup/doc/introSebastian Thiel2013-03-261-17/+23
|\ \ | |/ |/| Fixup/doc/intro
| * fix indentation of bulletValentin Haenel2013-03-261-1/+1
| |
| * use proper synatx highlighting for shell commandsValentin Haenel2013-03-261-7/+13
| |
| * retabValentin Haenel2013-03-261-1/+1
| |
| * fix trailing whitespaceValentin Haenel2013-03-261-8/+8
|/
* Merge pull request #79 from znerol/feature/master/cmd-output-stripSebastian Thiel2012-10-212-2/+30
|\ | | | | Add an output_strip kwarg to Git.execute
| * Add an output_strip kwarg to Git.executeLorenz Schori2012-10-182-2/+30
|/ | | | | | Strip the last line of the output if it is empty (default). Stripping should be disabled whenever it is important that the output is not modified in any way. For example when retrieving patch files using git-diff.
* Merge pull request #68 from FlorianLudwig/masterSebastian Thiel2012-07-241-0/+3
|\ | | | | Fix GitPython on systems with language != english
| * Make GitPython work on non English systemsFlorian Ludwig2012-07-241-0/+3
|/
View Lorry Controller Status