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

Added push alias

Browse Source
This commit is contained in:
Vivian Elisabeth H.
2026-01-13 20:00:01 +01:00
parent b4edfa868c
commit 53d2a33ddf
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,3 +15,4 @@ alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg"
############# #############
alias cherry-merge="$ZSH_CUSTOM/scripts/cherry-merge.sh" alias cherry-merge="$ZSH_CUSTOM/scripts/cherry-merge.sh"
alias push-main-current="$ZSH_CUSTOM/scripts/push-main-current.sh"

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

@@ -14,7 +14,7 @@ if [ $MAIN_BRANCH == $TARGET_BRANCH ]; then
fi fi
echo "Target branch: $TARGET_BRANCH" echo "Target branch: $TARGET_BRANCH"
sleep 2 sleep 1
git switch "$MAIN_BRANCH" || exit 1 git switch "$MAIN_BRANCH" || exit 1

19
zsh/.omz-custom/scripts/push-main-current.sh Executable file
View File

@@ -0,0 +1,19 @@
#!/usr/bin/env bash
MAIN_BRANCH="main"
TARGET_BRANCH=$(git branch --show-current)
if [ -z $TARGET_BRANCH ]; then
echo "Cannot find target branch, are you in a git repo?"
exit 1
fi
if [ $MAIN_BRANCH == $TARGET_BRANCH ]; then
echo "You are on main, silly"
exit 1
fi
echo "Target branch: $TARGET_BRANCH"
sleep 1
git push origin "$MAIN_BRANCH" "$TARGET_BRANCH"