diff options
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/sync_default_gems.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index c065b9c468..07deee6c64 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -391,12 +391,11 @@ def update_default_gems(gem) `git co ruby-core/master` `git branch ruby-core` end - `git co ruby-core` `git fetch ruby-core master --no-tags` + `git co ruby-core` `git rebase ruby-core/master` `git co master` - `git stash` - `git pull --rebase` + `git rebase origin/master` end end |