From 4c536d76f9fe1a2a7f528b2aa1f609d7e64b2a28 Mon Sep 17 00:00:00 2001 From: Ivan Pozdeev Date: Sat, 10 Jan 2026 05:57:11 +0300 Subject: [PATCH] Fix "merge: origin - not something we can merge" in recent Git versions Git 2.13.0 dropped support for the `git merge HEAD ...` syntax (https://github.com/git/git/commit/b4391657ed96c8dd2881d5c9fcad39a07d8cb92a) Closes #29 --- bin/pyenv-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pyenv-update b/bin/pyenv-update index 684defe..bf8a9f8 100755 --- a/bin/pyenv-update +++ b/bin/pyenv-update @@ -65,7 +65,7 @@ update_repo() { ( cd "${repo}" && \ git fetch --tags "${REMOTE}" "${BRANCH_CHOICE}" && \ - git merge --ff "${REMOTE}" "${BRANCH_CHOICE}" + git merge --ff "${REMOTE}"/"${BRANCH_CHOICE}" ) }