paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools: Use 'upstream' as expected name for main zulip repo.

Browse Source 
Fixes: #1698.
This commit is contained in:
Tim Abbott
2016-08-24 14:23:08 -07:00
parent 797a7ef97b
commit 4c834172ed
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/fetch-rebase-pull-request
View File

@@ -3,8 +3,8 @@ set -e
set -x
request_id="$1"
git fetch origin "pull/$request_id/head"
git checkout origin/master -b "review-${request_id}"
git fetch upstream "pull/$request_id/head"
git checkout upstream/master -b "review-${request_id}"
git reset --hard FETCH_HEAD
git pull --rebase

2
tools/reset-to-pull-request
View File

@@ -3,5 +3,5 @@ set -e
set -x
request_id="$1"
git fetch origin "pull/$request_id/head"
git fetch upstream "pull/$request_id/head"
git reset --hard FETCH_HEAD