diff options
| author | Brad King <brad.king@kitware.com> | 2012-03-02 18:41:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-03-02 18:41:42 (GMT) |
| commit | ec127a560d6bdcb32960515563ba5fee42f4a3c9 (patch) | |
| tree | 47e6818a32ab2ac09ba64cf1fcb8cede61932c6c /Utilities | |
| parent | d2c3686a08efa32142f250a93cf77be4d51eafb1 (diff) | |
| parent | 7e293acce3e66cd5292051119706e1a34b248092 (diff) | |
| download | CMake-ec127a560d6bdcb32960515563ba5fee42f4a3c9.zip CMake-ec127a560d6bdcb32960515563ba5fee42f4a3c9.tar.gz CMake-ec127a560d6bdcb32960515563ba5fee42f4a3c9.tar.bz2 | |
Merge branch 'setup' into developer-setup
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/GitSetup/.gitattributes | 3 | ||||
| -rw-r--r-- | Utilities/GitSetup/README | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Utilities/GitSetup/.gitattributes b/Utilities/GitSetup/.gitattributes index 51d63be..facbbb2 100644 --- a/Utilities/GitSetup/.gitattributes +++ b/Utilities/GitSetup/.gitattributes @@ -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 diff --git a/Utilities/GitSetup/README b/Utilities/GitSetup/README index 2f9f1ec..cf468fb 100644 --- a/Utilities/GitSetup/README +++ b/Utilities/GitSetup/README @@ -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 ------------- |