diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-01-26 07:40:56 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-01-26 07:40:56 +0900 |
| commit | aacd918340e20e4556a6369c3f5933226b0bb093 (patch) | |
| tree | 5aa66f2f02af9a64b8b0f6dffbfe6bf777b2c316 /tool/sync_default_gems.rb | |
| parent | da2d6ca8f180a1d88f08fa09812ab3b333cc5c9d (diff) | |
Do not use `git pull` because origin/master was already fetched.
Diffstat (limited to 'tool/sync_default_gems.rb')
| -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 |