Permalink
Browse files

Add gitattributes

  • Loading branch information...
1 parent 7c4d95e commit 00ec629dea98f5160fed7c9cf0046c91f503a512 @sj26 committed Feb 10, 2013
Showing with 3 additions and 1 deletion.
  1. +2 −0 .gitattributes
  2. +1 −1 move-in
View
@@ -0,0 +1,2 @@
+Gemfile.lock merge=bundleinstall
+db/schema.rb merge=railsschema
View
@@ -16,7 +16,7 @@ pushd $HOME
git submodule update
popd
- for file in .ackrc .bin .gemrc .gitconfig .gitignore .js .pryrc .railsrc .tmux.conf .vim .zsh
+ for file in .ackrc .bin .gemrc .git{config,ignore,attributes} .js .pryrc .railsrc .tmux.conf .vim .zsh
[ -L $file ] || ln -fs .home/$file
for suffix in rc
[ -L .vim$suffix ] || ln -fs .vim/$suffix .vim$suffix

0 comments on commit 00ec629

Please sign in to comment.