summaryrefslogtreecommitdiff
path: root/contrib/subtree/.gitignore
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-10-20 12:25:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-20 12:25:16 -0700
commit9c6be8b5ab89bcc800d500f84358e4e63ee88042 (patch)
tree62d109e47eea0ae45e29556f356a2bcfea6c2ab5 /contrib/subtree/.gitignore
parentMerge branch 'jn/parse-config-slot' (diff)
parentcontacts: add a Makefile to generate docs and install (diff)
downloadtgif-9c6be8b5ab89bcc800d500f84358e4e63ee88042.tar.xz
Merge branch 'ss/contrib-subtree-contacts'
* ss/contrib-subtree-contacts: contacts: add a Makefile to generate docs and install subtree: add an install-html target
Diffstat (limited to 'contrib/subtree/.gitignore')
-rw-r--r--contrib/subtree/.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore
index 91360a3d7f..0b9381abca 100644
--- a/contrib/subtree/.gitignore
+++ b/contrib/subtree/.gitignore
@@ -1,6 +1,7 @@
*~
git-subtree
-git-subtree.xml
git-subtree.1
+git-subtree.html
+git-subtree.xml
mainline
subproj