Merge remote-tracking branch 'upstream/pull/5296'

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 444dc99c9c1cc38a1184c75778de5e916fad7977..380a88047f9ad35e43edb8abe354958e78fdadbe 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .DS_Store
 .bundle/config
 .idea
+.local-overcommit.yml
 .ruby-gemset
 .ruby-version
 .vagrant