From aacd918340e20e4556a6369c3f5933226b0bb093 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 26 Jan 2020 07:40:56 +0900 Subject: Do not use `git pull` because origin/master was already fetched. --- tool/sync_default_gems.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tool') 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 -- cgit v1.2.3