Permalink
Browse files

[git] update ignore (unignore gemfile), add rebase always

  • Loading branch information...
1 parent 3a54279 commit 623df2128a284f11d4101aa1e337d3119f3b2bab @jamesonjlee committed Mar 31, 2013
Showing with 4 additions and 6 deletions.
  1. +2 −6 gitconfig
  2. +2 −0 gitignore
View
@@ -17,9 +17,5 @@
excludesfile = ~/.gitignore
editor = vim
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
-[difftool "sourcetree"]
- cmd = opendiff \"$LOCAL\" \"$REMOTE\"
- path =
-[mergetool "sourcetree"]
- cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
- trustExitCode = true
+[branch]
+ autosetuprebase = always
View
@@ -29,6 +29,8 @@ db/*.sqlite3
*.lock
.lockScript
.lock-wscript
+# minue gemfile
+!Gemfile.lock
# for node.js
.node_modules

0 comments on commit 623df21

Please sign in to comment.