Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b54b830fdd7a3582705a3031b9806b1fd4488905..d27140896a6c3dc4ad0702dccd20dec78cd38a4a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-ikiwiki.setup
-Makefile
+/ikiwiki.setup
+/Makefile

 Makefile.old
 blib/*
 /cover_db
 Makefile.old
 blib/*
 /cover_db


@@ -24,3 +24,5 @@ po/underlays/directives/ikiwiki/directive/*.mdwn
 po/underlays_copy_stamp
 underlays/locale
 /t/tmp/
 po/underlays_copy_stamp
 underlays/locale
 /t/tmp/

+/t/manual/*/git/
+/t/manual/*/html/