From 4e8193347e5b9ec01178dfdc6fe200aecaeb432f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brotmetchaes=20=C2=B7=20kevadesu?= <76264518+kevadesu@users.noreply.github.com> Date: Sat, 18 Jan 2025 05:05:12 +0100 Subject: [PATCH] bruh --- main.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.sh b/main.sh index 0c4068b..151b52a 100755 --- a/main.sh +++ b/main.sh @@ -3,7 +3,7 @@ function gir.main() { clear git remote -v - MENU_CHOICE=$(gum filter --header.foreground="#fab387" --unselected-prefix.foreground="#fab387" --selected-indicator.foreground="#fab387" --indicator.foreground="#fab387" --match.foreground="#fab387" --prompt="| " --indicator=">" --header="Current directory: $PWD" --placeholder="Option" "Time Machine" "Add addition to last commit" "Edit last commit's message" "Correct an edit to a different branch" "Diff with fancy flag" "Undo file" "Undo commit" "Read file" "Add files to commit" "Remove files from commit" "Commit" "Push changes" "Pull changes" "(Destructive) Reset to remote state" "(Re)initialise repository" "Quit") + MENU_CHOICE=$(gum filter --header.foreground="#fab387" --unselected-prefix.foreground="#fab387" --selected-indicator.foreground="#fab387" --indicator.foreground="#fab387" --match.foreground="#fab387" --prompt="| " --indicator=">" --header="Current directory: $PWD" --placeholder="Option" "Time Machine" "Add addition to last commit" "Edit last commit's message" "Correct an edit to a different branch" "Diff with fancy flag" "Undo file" "Undo commit" "Read file" "Add files to commit" "Remove files from commit" "Commit" "Push changes" "Pull changes" "Stash changes" "(Destructive) Reset to remote state" "(Re)initialise repository" "Quit") case $MENU_CHOICE in "Time Machine") gir.timemachine @@ -106,8 +106,8 @@ function gir.undofile() { function gir.reset() { git fetch origin - git checkout master - git reset --hard origin/master + git checkout master || git checkout main + git reset --hard origin/master || git reset --hard origin/main git clean -d --force }