Patch for https://github.com/schacon/ruby-git/issues/32

used git pull instead of fetch + merge