Mirrors/pyenv-update
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv-update.git synced 2026-02-05 18:47:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from jawshooah/patch-1

Browse Source 
Ensure update is a fast-forward merge
This commit is contained in:
Yamashita, Yuu 2015-07-01 01:01:09 +09:00
commit c468d9f4b2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pyenv-update
View File

@ -43,7 +43,7 @@ verify_repo() {
update_repo() { update_repo() {
info "Updating $1..." info "Updating $1..."
verify_repo "$1" && verify_repo "$1" &&
( cd "${repo}" && git pull "${REMOTE}" "${BRANCH}" ) ( cd "${repo}" && git pull --no-rebase --ff "${REMOTE}" "${BRANCH}" )
} }
info() { info() {