volker.raschek/git-docker
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull requests instead of rebase [CI SKIP]

Browse Source
This commit is contained in:
Brad Rydzewski 2019-04-18 16:37:00 -07:00 committed by GitHub
parent 584c0ee731
commit a818535cfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
windows/clone-pull-request.ps1
View File

@ -13,4 +13,4 @@ git fetch $FLAGS origin "+refs/heads/${Env:DRONE_COMMIT_BRANCH}:"
git checkout $Env:DRONE_COMMIT_BRANCH
git fetch origin "${Env:DRONE_COMMIT_REF}:"
git rebase $Env:DRONE_COMMIT_SHA
git merge $Env:DRONE_COMMIT_SHA