Merge branch 'bm/merge-base-octopus-dedup' into maint
[git/gitweb.git] / contrib / subtree / .gitignore
blob91360a3d7f0ad2d589dfe0365d4456d56853e7c0
1 *~
2 git-subtree
3 git-subtree.xml
4 git-subtree.1
5 mainline
6 subproj