Merge branch 'jc/color-diff-doc' into maint-1.8.1
[git] / contrib / subtree / .gitignore
1 *~
2 git-subtree
3 git-subtree.xml
4 git-subtree.1
5 mainline
6 subproj