Merge branch 'master' into debian-jessie-backports

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

diff --git a/.gitignore b/.gitignore
index fe1c3d441cc362d12390c70d8e3c9266f1ac5021..b54b830fdd7a3582705a3031b9806b1fd4488905 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,10 +8,15 @@ html/*
 ikiwiki.out
 ikiwiki-transition.out
 ikiwiki-calendar.out
 ikiwiki.out
 ikiwiki-transition.out
 ikiwiki-calendar.out

+ikiwiki-comment.out

 pm_to_blib
 pm_to_blib

+/MYMETA.json
+/MYMETA.yml

 *.man
 /po/cover_db
 *.man
 /po/cover_db

+/po/html/

 po/po2wiki_stamp
 po/po2wiki_stamp

+/po/underlays/.ikiwiki

 po/underlays/*/*.mdwn
 po/underlays/basewiki/*/*.mdwn
 po/underlays/basewiki/*/*/*.mdwn
 po/underlays/*/*.mdwn
 po/underlays/basewiki/*/*.mdwn
 po/underlays/basewiki/*/*/*.mdwn