Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
52826019
Commit
52826019
authored
Aug 10, 2021
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix merge-upstream.sh
parent
2c428b5c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
merge-upstream.sh
scripts/upgradeable/merge-upstream.sh
+2
-2
No files found.
scripts/upgradeable/merge-upstream.sh
View file @
52826019
...
...
@@ -17,6 +17,6 @@ input="${REF#refs/heads/}"
upstream
=
"
${
input
#patched/
}
"
branch
=
"patched/
$upstream
"
git checkout
"
$branch
"
2>/dev/null
||
git checkout
-b
"
$branch
"
patches
git checkout
"
$branch
"
2>/dev/null
||
git checkout
-b
"
$branch
"
origin/
patches
git fetch
'https://github.com/OpenZeppelin/openzeppelin-contracts.git'
"
$upstream
"
git merge patches FETCH_HEAD
-m
"Merge upstream
$upstream
into
$branch
"
git merge
origin/
patches FETCH_HEAD
-m
"Merge upstream
$upstream
into
$branch
"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment