Skip to content
Browse files

git ignoring emacs backup files, rbenv .ruby_version, and mergetool *…

….orig files
  • Loading branch information...
1 parent 8ef255f commit 6509a90498e5b8dc7158b6a7145dded15574df1a @jmoody jmoody committed Feb 3, 2014
Showing with 11 additions and 0 deletions.
  1. +11 −0 .gitignore
View
11 .gitignore
@@ -13,3 +13,14 @@ ruby-gem/lib/calabash-android/lib/TestServer.apk
calabash-android-*.gem
.idea
*.iml
+
+# rbenv
+.ruby-version
+
+# emacs and vim
+(.*/)?\#[^/]*\#$
+tags
+
+# mergetools
+*.orig
+

0 comments on commit 6509a90

Please sign in to comment.
Something went wrong with that request. Please try again.