From caac42089477732569bc0cb23e108f3289bd95a5 Mon Sep 17 00:00:00 2001
From: Vivian Elisabeth H <36878099+SparkleDEV@users.noreply.github.com>
Date: Sat, 10 Jan 2026 17:25:56 +0100
Subject: [PATCH] cherry-merge script fix

---
 zsh/.omz-custom/aliases.zsh                                   | 2 +-
 zsh/.omz-custom/scripts/{cherry-merge.zsh => cherry-merge.sh} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename zsh/.omz-custom/scripts/{cherry-merge.zsh => cherry-merge.sh} (95%)

diff --git a/zsh/.omz-custom/aliases.zsh b/zsh/.omz-custom/aliases.zsh
index 20ee7ef..99156b8 100644
--- a/zsh/.omz-custom/aliases.zsh
+++ b/zsh/.omz-custom/aliases.zsh
@@ -14,4 +14,4 @@ alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg"
 ## Scripts ##
 #############
 
-alias cherry-merge="$ZSH_CUSTOM/scripts/cherry-merge.zsh"
+alias cherry-merge="$ZSH_CUSTOM/scripts/cherry-merge.sh"
diff --git a/zsh/.omz-custom/scripts/cherry-merge.zsh b/zsh/.omz-custom/scripts/cherry-merge.sh
similarity index 95%
rename from zsh/.omz-custom/scripts/cherry-merge.zsh
rename to zsh/.omz-custom/scripts/cherry-merge.sh
index a566189..9f385e1 100755
--- a/zsh/.omz-custom/scripts/cherry-merge.zsh
+++ b/zsh/.omz-custom/scripts/cherry-merge.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env bash
 
 MAIN_BRANCH="main"
 TARGET_BRANCH=$(git branch --show-current)