Merge pull request #131 from szymonos/dev

Merge dev to main

.assets/config/bash_cfg/aliases_git.sh

@@ -50,6 +50,7 @@ alias gbl='git blame -b -w'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
+alias gbd!='git branch -D'
 alias gbda='git branch --format="%(refname:short)" --merged | command grep -vE "^ma(in|ster)$|^dev(|el|elop)$|^qa$|^stage$|^trunk$" | command xargs -n 1 git branch -d'
 alias gbnm='git branch --no-merged'
 alias gbr='git branch --remote'
@@ -62,15 +63,15 @@ alias gbss='git bisect start'
 alias gcv='git commit -v'
 alias gc!='git commit -v --amend'
 alias gca='git commit -v -a'
-alias gaca='git add --all && git commit -v -a'
+alias gac='git add --all && git commit -v -a'
 alias gca!='git commit -v -a --amend'
-alias gaca!='git add --all && git commit -v -a --amend'
+alias gac!='git add --all && git commit -v -a --amend'
 alias gcam='git commit -a -m'
-alias gacam='git add --all && git commit -a -m'
+alias gacm='git add --all && git commit -a -m'
 alias gcan!='git commit -v -a --no-edit --amend'
-alias gacan!='git add --all && git commit -v -a --no-edit --amend'
+alias gacn!='git add --all && git commit -v -a --no-edit --amend'
 alias gcans!='git commit -v -a -s --no-edit --amend'
-alias gacans!='git add --all && git commit -v -a -s --no-edit --amend'
+alias gacns!='git add --all && git commit -v -a -s --no-edit --amend'
 alias gcmsg='git commit -m'
 alias gcn!='git commit -v --no-edit --amend'
 alias gcsm='git commit -s -m'

.assets/provision/setup_gh_repos.sh

@@ -35,7 +35,7 @@ fi
 # *check gh authentication status and login to GitHub if necessary
 retry_count=0
 while [[ true && $retry_count -lt 5 ]]; do
-  gh auth status 2>&1 | grep -qw 'Token: gho_' && github='https://github.com/' && break || true
+  gh auth status 2>&1 | grep -qw 'Token:' && github='https://github.com/' && break || true
   gh auth login
   ((retry_count++))
 done