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)