summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-11-14 16:10:26 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-11-14 16:15:31 +0100
commitc914637ab146c23484a730175aa10340db91be70 (patch)
treed40ad34a07acdaab828f82ff05029f897bb20bc9 /.gitignore
parente1ad78eb7494513f6c53f0226fe3cb7df4e67513 (diff)
parentd43055d44e58e8f010a71ec974c6a26f091a0b7a (diff)
downloadgitpython-c914637ab146c23484a730175aa10340db91be70.tar.gz
Merge branch 'tox' of https://github.com/hashar/GitPython into hashar-tox
Conflicts: README.md requirements.txt setup.py
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 2e8e1749..787b3d44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ cover/
/doc/_build
nbproject
*.sublime-workspace
+
+/*egg-info
+/.tox