Merge branch 'setup' into developer-setup

This commit is contained in:
Brad King 2012-03-02 13:41:42 -05:00
commit ec127a560d
2 changed files with 3 additions and 7 deletions

View File

@ -1,4 +1,7 @@
.git* export-ignore
# Exclude from source archives files specific to Git work tree.
* export-ignore
tips eol=lf whitespace=indent-with-non-tab
setup-* eol=lf whitespace=indent-with-non-tab

View File

@ -37,13 +37,6 @@ Commit the merge with an informative message:
the general GitSetup repository "setup" branch.
------------------------------------------------------------------------
Optionally add to the project ".gitattributes" file the line
/Utilities/GitSetup export-ignore
to exclude the GitSetup directory from inclusion by "git archive"
since it does not make sense in source tarballs.
Configuration
-------------