From c9d2adb5d56a970267f30a26c1d31c75f4182b63 Mon Sep 17 00:00:00 2001 From: Marley Rae Date: Wed, 31 Jan 2024 17:32:03 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20gwip=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- git/aliases.config.fish | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git/aliases.config.fish b/git/aliases.config.fish index 1b7a913..3a731c1 100644 --- a/git/aliases.config.fish +++ b/git/aliases.config.fish @@ -3,13 +3,13 @@ abbr -a g --position command git ################################################################################ -# Functions # +# Functions # ################################################################################ function git_develop_branch command git rev-parse --git-dir &>/dev/null || return set -l branch - + for branch in dev devel develop development if command git show-ref -q --verify refs/heads/$branch echo $branch @@ -158,10 +158,10 @@ abbr -a gstas --position command "git stash show --text" function gwip git add -A git rm (git ls-files --deleted) 2> /dev/null - git commit -- -no-verify --no-gpg-sign --message "🚧 --wip-- [skip ci]" + git commit --no-verify --no-gpg-sign --message "🚧 --wip-- [skip ci]" end -function unwip +function gunwip git rev-list --max-count=1 --format="%s" HEAD | \ grep -q "🚧 --wip-- [skip ci]" \ && git reset HEAD~1