Skip to content

Commit

Permalink
Added default pull : rebase to git config
Browse files Browse the repository at this point in the history
  • Loading branch information
ndbroadbent committed Feb 21, 2013
1 parent 65521e6 commit 0579a96
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion git/gitconfig
Expand Up @@ -28,6 +28,9 @@
[push]
default = current

[pull]
rebase = true

[merge "bundleinstall"]
name = runs bundle install to generate Gemfile.lock
driver = "bash -l -c '[ -e .rvmrc ] && . .rvmrc; bundle install'"
Expand All @@ -50,4 +53,3 @@
end\n\
File.open(%(%A), %(w)) {|f| f.write(b)}\n\
exit 1 if b.include?(%(<)*%L)'"

0 comments on commit 0579a96

Please sign in to comment.