vivian/.dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cherry-merge script fix

Browse Source
This commit is contained in:
Vivian Elisabeth H.
2026-01-10 17:25:56 +01:00
parent c5c6d93689
commit 5d20fc669f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zsh/.omz-custom/aliases.zsh
View File

@@ -14,4 +14,4 @@ alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg"
## Scripts ## ## Scripts ##
############# #############
alias cherry-merge="$ZSH_CUSTOM/scripts/cherry-merge.zsh" alias cherry-merge="$ZSH_CUSTOM/scripts/cherry-merge.sh"

2
zsh/.omz-custom/scripts/cherry-merge.zsh → zsh/.omz-custom/scripts/cherry-merge.sh
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env zsh #!/usr/bin/env bash
MAIN_BRANCH="main" MAIN_BRANCH="main"
TARGET_BRANCH=$(git branch --show-current) TARGET_BRANCH=$(git branch --show-current)