summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2012-10-20 15:57:23 -0700
committerChris Jerdonek <chris.jerdonek@gmail.com>2012-10-20 15:57:23 -0700
commitba5ef6d31eb2705df846444b56893b555948fbf8 (patch)
treeadf04a7e2df34a7442b448573593cf316b3fca88 /.gitignore
parentb8a3d0c6cea62874bac2414db2c06856293d8877 (diff)
parent5e9a226992ce9b3c9fa1ecd9de700b8d8ff4f136 (diff)
downloadpystache-ba5ef6d31eb2705df846444b56893b555948fbf8.tar.gz
Merge branch 'development' into 'master': staging v0.5.3-rc
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index c9b5217..758d62d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@
# Our tox runs convert the doctests in *.rst files to Python 3 prior to
# running tests. Ignore these temporary files.
*.temp2to3.rst
+# The setup.py "prep" command converts *.md to *.temp.rst (via *.temp.md).
+*.temp.md
+*.temp.rst
# TextMate project file
*.tmproj
# Distribution-related folders and files.