aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-19 22:09:47 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-19 22:09:47 +0000
commitc2088414102bcd95d551219cfef2b01f90724ddd (patch)
treecb83c2b97b1d8108aeb4245ef6152e5bba17e3c4
parent33b832979b2d01a865a25c9faefe6a3cee6e5dc2 (diff)
downloadruby-c2088414102bcd95d551219cfef2b01f90724ddd.tar.gz
add .gitattributes
This improves method detection for Ruby source files; making output of "git diff" and "git log -p -W" more readable for git users looking at our Ruby code. git will automatically notice this file and start using it when generating diff output. See the gitattributes(5) manpage for more details. Ruby pattern definitions reside in userdiff.c of the git sources at git://git.kernel.org/pub/scm/git/git.git * .gitattributes: new file for git users [ruby-core:71578] [Feature #11713] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.gitattributes5
-rw-r--r--ChangeLog5
2 files changed, 10 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..d9785fad00
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+*.gemspec diff=ruby
+*.rb diff=ruby
+bin/* diff=ruby
+tool/update-deps diff=ruby
+tool/make-snapshot diff=ruby
diff --git a/ChangeLog b/ChangeLog
index 360494473f..ce4ce44944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 20 06:52:53 2015 Eric Wong <e@80x24.org>
+
+ * .gitattributes: new file for git users
+ [ruby-core:71578] [Feature #11713]
+
Thu Nov 19 22:35:31 2015 Tanaka Akira <akr@fsij.org>
* ext/socket/ancdata.c: Check buffer full and ignore MSG_TRUNC flag.