Repository: lucenenet Updated Branches: refs/heads/branch_3.0x [created] ca6e1b4dd
git stuff Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ca6e1b4d Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ca6e1b4d Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ca6e1b4d Branch: refs/heads/branch_3.0x Commit: ca6e1b4ddf5086a30994276b90c50546167d71b1 Parents: fb51230 Author: Itamar Syn-Hershko <[email protected]> Authored: Sat Sep 6 22:08:05 2014 +0300 Committer: Itamar Syn-Hershko <[email protected]> Committed: Sat Sep 6 22:08:05 2014 +0300 ---------------------------------------------------------------------- .gitattributes | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ .gitignore | 34 ++++++++++++++--------------- 2 files changed, 80 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ca6e1b4d/.gitattributes ---------------------------------------------------------------------- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..be3fd97 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ca6e1b4d/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index d4e145a..7cfa62d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,18 @@ -# This is the git pattern ignore file for the project. -# Git can be used with svn http://code.google.com/p/msysgit/ -bin -Bin -obj -*.user -*.suo -*.bak -*.vs10x -*.VisualState.xml -*.userprefs -*.pidb -test-results -build/artifacts -build/bin -_ReSharper* -*.orig +# This is the git pattern ignore file for the project. +# Git can be used with svn http://code.google.com/p/msysgit/ +bin +Bin +obj +*.user +*.suo +*.bak +*.vs10x +*.VisualState.xml +*.userprefs +*.pidb +test-results +build/artifacts +build/bin +_ReSharper* +*.orig packages/ \ No newline at end of file
