Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Unified Diff: .gitattributes

Issue 13811006: Clean up hidden git files (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | .gitignore » ('j') | .gitignore » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: .gitattributes
diff --git a/.gitattributes b/.gitattributes
index 741c4d53b5a0338cf36900a283e89408d0f9d457..e9754a2a6974fa2b73898ca39d84f9f9eccc6852 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,27 +1,3 @@
-# To enable automatic merging of ChangeLog files, use the following command:
-# git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
-ChangeLog* merge=changelog
-
-# To enable smart diffing of ObjC[++] files, run the following commands:
-# git config diff.objcpp.xfuncname "^[-+@a-zA-Z_].*$"
-# git config diff.objcppheader.xfuncname "^[@a-zA-Z_].*$"
-*.m diff=objc
-*.mm diff=objcpp
Nico 2013/04/08 23:02:36 There's still objc code in webkit (?)
-mac/*.h diff=objcppheader
-*/mac/*.h diff=objcppheader
-*/*/mac/*.h diff=objcppheader
-objc/*.h diff=objcppheader
-*/objc/*.h diff=objcppheader
-*/*/objc/*.h diff=objcppheader
-
-# To enable smart diffing of *.strings files, run the following command:
-# git config diff.localizablestrings.textconv "iconv -f utf-16 -t utf-8"
-*.strings diff=localizablestrings
-
-*.vcproj eol=crlf
-*.vsprops eol=crlf
-*.sln eol=crlf
-
# For best performance, place rules for deep paths in the parent directory.
# For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here,
# place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes
« no previous file with comments | « no previous file | .gitignore » ('j') | .gitignore » ('J')

Powered by Google App Engine
This is Rietveld 408576698