Merge branch 'setup' into developer-setup
This commit is contained in:
commit
ec127a560d
3
Utilities/GitSetup/.gitattributes
vendored
3
Utilities/GitSetup/.gitattributes
vendored
@ -1,4 +1,7 @@
|
|||||||
.git* export-ignore
|
.git* export-ignore
|
||||||
|
|
||||||
|
# Exclude from source archives files specific to Git work tree.
|
||||||
|
* export-ignore
|
||||||
|
|
||||||
tips eol=lf whitespace=indent-with-non-tab
|
tips eol=lf whitespace=indent-with-non-tab
|
||||||
setup-* eol=lf whitespace=indent-with-non-tab
|
setup-* eol=lf whitespace=indent-with-non-tab
|
||||||
|
@ -37,13 +37,6 @@ Commit the merge with an informative message:
|
|||||||
the general GitSetup repository "setup" branch.
|
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
|
Configuration
|
||||||
-------------
|
-------------
|
||||||
|
Loading…
x
Reference in New Issue
Block a user