Mirrors/pyenv-update
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv-update.git synced 2026-01-22 12:37:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix "merge: origin - not something we can merge" in recent Git versions

Browse Source 
Git 2.13.0 dropped support for the `git merge <msg> HEAD <commit>...` syntax
(b4391657ed)

Closes #29
This commit is contained in:
Ivan Pozdeev 2026-01-10 05:57:11 +03:00
parent 39b088e56c
commit 4c536d76f9
No known key found for this signature in database
GPG Key ID: FB6A628DCF06DCD7
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

@ -65,7 +65,7 @@ update_repo() {
( (
cd "${repo}" && \ cd "${repo}" && \
git fetch --tags "${REMOTE}" "${BRANCH_CHOICE}" && \ git fetch --tags "${REMOTE}" "${BRANCH_CHOICE}" && \
git merge --ff "${REMOTE}" "${BRANCH_CHOICE}" git merge --ff "${REMOTE}"/"${BRANCH_CHOICE}"
) )
} }