aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2008-06-15 16:54:43 -0700
committerDavid Aguilar <davvid@gmail.com>2008-06-15 16:54:43 -0700
commit579e2c07bbb39577fa32fed8cb42297c1c5516d8 (patch)
treed8c0b5de14c50309c41b9feed2131debea557d5f /.gitignore
parentfd5f111439e7a2e730b602a155aa533c68badbf8 (diff)
parent0aa1ce356c7c3d53d6ee035b4c7bcf425e108cdc (diff)
downloadGitPython-579e2c07bbb39577fa32fed8cb42297c1c5516d8.tar.gz
GitPython-579e2c07bbb39577fa32fed8cb42297c1c5516d8.zip
Merge commit 'sverre/master' into david
* commit 'sverre/master': Added a with_keep_cwd option Improved the GIT_PYTHON_TRACE=full output format Added /dist to .gitignore Conflicts: lib/git/cmd.py Signed-off-by: David Aguilar <davvid@gmail.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index faca3a87..68709910 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
*~
/lib/GitPython.egg-info
/build
+/dist