feat: ✨ revamp aliases

Author: Thomas G.

src/gitutils/alias.json

@@ -1,19 +1,23 @@
 {
+    "abort": "git rebase --abort",
+    "aliases": "git config --get-regexp '^alias\\.' | awk '{printf \"%-20s = \",$1; for(i=2;i<=NF;++i) printf \"%s%s\", $i, (i<NF?OFS:ORS)}'",
     "amend": "git diff-index --cached --quiet HEAD || git commit --amend -C HEAD",
-    "beta": "git release-beta",
     "cleanup": "git stash save --include-untracked  --keep-index; git clean --force -d -x -e \".env*\"; git stash apply --index; git stash drop",
     "co": "git commit -m \"$1\"",
     "conflict": "git diff --name-only --diff-filter=U",
     "continue": "git checkout -- . && git rebase --continue",
-    "crush": "git stash save --keep-index --include-untracked  && git reset --hard $(git rev-parse --abbrev-ref --symbolic-full-name @{u})",
     "editLast": "git commit --amend --edit",
+    "fbeta": "git release-beta",
+    "ffeat": "git flow start feature $1",
+    "fhotf": "git release-hotfix",
     "fixable": "git log --oneline $(git rev-parse --abbrev-ref --symbolic-full-name @{u})..HEAD",
     "fixAuthor": "git config \"${1---global}\" user.name \"$(git log -2 --pretty=format:'%an' | tail -1)\" && git config \"${1---global}\" user.email \"$(git log -2 --pretty=format:'%ae' | tail -1)\"",
-    "fixConfig": "git config --global --get-regexp '^alias.' | grep '/tmp' | cut -d ' ' -f1 | while read -r alias; do git config --global --unset \"$alias\"; done",
+    "fixConfig": "rm -f ~/.gitconfig",
     "fixMode": "git diff -p -R --no-color | grep -E \"^(diff|(old|new) mode)\" --color=never | git apply --allow-empty --no-index",
     "forceable": "git log --oneline $(echo $(git rev-parse --abbrev-ref --symbolic-full-name @{u};git log --merges --first-parent -1 --pretty=%h)| tail -1)..HEAD $*",
+    "fprod": "git release-prod",
+    "ftag": "git tag -a $1 -m \"$1\" && git push origin $1",
     "go": "git commit -m \"$1\" --all",
-    "hfix": "git release-hotfix",
     "histo": "git log --oneline $(git log --merges --first-parent -1 --pretty=%h) $*",
     "ignore": "grep -qxF \"$1\" .gitignore || echo \"$1\" >>.gitignore && git rm --cached \"$1\" 2>/dev/null",
     "initFrom": "git clone --origin template --branch master --depth 1 -- $1 $2 && cd $2 && git branch -m master template && git checkout -b master && git checkout -b develop",
@@ -22,11 +26,9 @@
     "isFixup": "git log -1 --pretty=%s | grep -q fixup! && exit 0 || exit 1",
     "isRebase": "git rev-parse --git-dir | grep -q rebase-merge || git rev-parse --git-dir | grep -q rebase-apply",
     "pf": "git push --force-with-lease",
-    "prod": "git release-prod",
-    "rAbort": "git rebase --abort",
-    "rCont": "git rebase --continue",
+    "refresh": "git stash save --keep-index --include-untracked  && git reset --hard $(git rev-parse --abbrev-ref --symbolic-full-name @{u})",
     "renameTag": "set -e;git tag $2 $1; git tag -d $1;git push origin :refs/tags/$1;git push --tags",
-    "stack": "git commit --amend --no-edit --no-verify -C HEAD",
+    "stack": "git diff-index --cached --quiet HEAD || git commit --amend --no-edit --no-verify -C HEAD",
     "sync": "git fetch --progress --prune --recurse-submodules=no origin && git stash save --keep-index --include-untracked && git merge --ff-only @{u} && git stash pop --index || git stash drop",
     "undo": "git reset --soft HEAD^ --"
 }

src/gitutils/devcontainer-feature.json

@@ -2,7 +2,7 @@
     "id": "gitutils",
     "name": "Git Aliases",
     "description": "A feature to add useful Git aliases to your shell.",
-    "version": "5.12.3",
+    "version": "5.13.0",
     "dependsOn": {
         "ghcr.io/devcontainers/features/node:1": "lts",
         "ghcr.io/tomgrv/devcontainer-features/common-utils:3": {