caleb-brown/gitattributes
1
0
Fork 0
mirror of https://github.com/gitattributes/gitattributes.git synced 2025-01-22 00:08:52 -05:00
Code

add Rails.gitattributes

Browse Source
This commit is contained in:
Danil Pismenny 2014-12-05 14:42:05 +04:00
parent 348e79e5c5
commit 65ea00bee8
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Rails.gitattributes Normal file
View File

@ -0,0 +1,7 @@
# These settings are for Ruby On Rails project
#
#
# Define a dummy ours merge strategy with:
#
# $ git config --global merge.ours.driver true
schema.rb merge=ours