@jswork/ushell-module-git 1.0.33 → 1.0.35

package/index.sh

@@ -1,96 +1,98 @@
 #!/usr/bin/env bash
 ## path:
-ROOT_PATH=$(dirname $BASH_SOURCE);
+ROOT_PATH=$(dirname $BASH_SOURCE)
 
 # 这个与我的命令 github-flow 冲突，所以暂时不用了
 # source $ROOT_PATH/modules/02-git-flow.sh;
-source $ROOT_PATH/modules/07-git-rebase.sh;
-source $ROOT_PATH/modules/11-lazygit.sh;
+source $ROOT_PATH/modules/07-git-rebase.sh
+source $ROOT_PATH/modules/11-lazygit.sh
 
 ## git base:
-alias gl='git pull';
-alias glo='git pull origin ';
-alias gp='git push';
-alias gpo='git push origin ';
-alias gpof='git push origin -f';
+alias gl='git pull'
+alias glo='git pull origin '
+alias gp='git push'
+alias gpo='git push origin '
+alias gpof='git push origin -f'
 
 # push branchs/tags/deletes
-alias gpa='git push --all -u';
-alias gpd="git push origin --delete ";
+alias gpa='git push --all -u'
+alias gpd="git push origin --delete "
 
-alias gaa='git add .';
-alias gcm='git commit -m ';
-alias gam='git commit -am ';
-alias goo='git checkout origin ';
-alias gc='git clone';
-alias gc1='git clone --depth=1';
+alias gaa='git add .'
+alias gcm='git commit -m '
+alias gam='git commit -am '
+alias goo='git checkout origin '
+alias gc='git clone'
+alias gc1='git clone --depth=1'
 
 # clean untrack files
 # https://stackoverflow.com/questions/61212/how-to-remove-local-untracked-files-from-the-current-git-working-tree
-alias gcf='git clean -f';
+alias gcf='git clean -f'
 
 # git fetch:
-alias gfo='git fetch origin';
-alias gft='git fetch';
-alias gfa='git fetch --all';
-alias gfp='git fetch --all --prune';
-
+alias gfo='git fetch origin'
+alias gft='git fetch'
+alias gfa='git fetch --all'
+alias gfp='git fetch --all --prune'
 
 ## git revert:
-alias gr='git checkout -f';
-alias grf='git clean -fd';
-alias gck='git checkout ';
-alias g-='git checkout -';
-alias gcy='git cherry-pick';
-
+alias gr='git checkout -f'
+alias grf='git clean -fd'
+alias grr='git checkout -f && git clean -fd'
+alias gck='git checkout '
+alias g-='git checkout -'
+alias gcy='git cherry-pick'
 
 # merge:
-alias gm='git merge ';
-alias gmm='git merge master';
-alias gmd='git merge develop';
-alias gmdev='git merge dev';
+alias gm='git merge '
+alias gmm='git merge master'
+alias gmd='git merge develop'
+alias gmdev='git merge dev'
 
 # merge from remote:
-alias gmmr='git merge origin/master';
-alias gmdr='git merge origin/develop';
-alias gmdevr='git merge origin/dev';
+alias gmmr='git merge origin/master'
+alias gmdr='git merge origin/develop'
+alias gmdevr='git merge origin/dev'
 
 ## chekcout
-alias gckm='git checkout master 2>/dev/null || git checkout main 2>/dev/null';
-alias gckd='git checkout develop 2>/dev/null || git checkout dev 2>/dev/null';
-alias gckb='git checkout beta';
-alias gckr='git checkout release';
+alias gckm='git checkout master 2>/dev/null || git checkout main 2>/dev/null'
+alias gckd='git checkout develop 2>/dev/null || git checkout dev 2>/dev/null'
+alias gckb='git checkout beta'
+alias gckr='git checkout release'
 
 ## git others:
-alias gs='git status ';
-alias ga='git add ';
-alias gb='git branch ';
-alias gbh='git branch -h';
-alias gd='git diff';
-alias gk='gitk --all&';
-alias gx='gitx --all';
-alias gg="${ROOT_PATH}/modules/05-quick-commit.sh";
-alias ggg='gaa && gcm "wip" && gp';
+alias gs='git status '
+alias ga='git add '
+alias gb='git branch '
+alias gbh='git branch -h'
+alias gd='git diff'
+alias gk='gitk --all&'
+alias gx='gitx --all'
+alias gg="${ROOT_PATH}/modules/05-quick-commit.sh"
+alias ggg='gaa && gcm "wip" && gp'
 
 ## git tags:
-alias gcd=". ${ROOT_PATH}/modules/01-gcd.sh";
-alias ggt="${ROOT_PATH}/modules/03-quick-tag.sh";
-alias git-reset="${ROOT_PATH}/modules/04-reset-git.sh";
-alias git-clean="${ROOT_PATH}/modules/06-git-clean.sh";
-
+alias gcd=". ${ROOT_PATH}/modules/01-gcd.sh"
+alias ggt="${ROOT_PATH}/modules/03-quick-tag.sh"
+alias git-reset="${ROOT_PATH}/modules/04-reset-git.sh"
+alias git-clean="${ROOT_PATH}/modules/06-git-clean.sh"
 
 # check git repo size
-alias git-size="git count-objects -vH";
+alias git-size="git count-objects -vH"
 
 ## add github cache:
-alias github-cache='ssh-add ~/.ssh/id_rsa.github.com >/dev/null 2>/dev/null;';
+alias github-cache='ssh-add ~/.ssh/id_rsa.github.com >/dev/null 2>/dev/null;'
 
 ## move subdirs to root:
-alias mvg="${ROOT_PATH}/modules/08-mvg.sh";
+alias mvg="${ROOT_PATH}/modules/08-mvg.sh"
 
 # oprr
-alias oprr="${ROOT_PATH}/modules/09-oprr.sh";
-alias opc="${ROOT_PATH}/modules/10-opc.sh";
+alias oprr="${ROOT_PATH}/modules/09-oprr.sh"
+alias opc="open $(guc -c)"
+
+# stash
+alias gst1='git stash'
+alias gst2='git stash pop'
 
 # git-url-cli
 # alias guc='git-url-cli'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jswork/ushell-module-git",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "Unix like shell module for git.",
   "main": "index.sh",
   "repository": {

package/modules/10-opc.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-# GIT_URL: git@github.com:afeiship/ushell-module-git.git
-GIT_URL=$(git config --get remote.origin.url)
-
-# 从 GIT_URL 中 获取 applyai-dev/applyai-frontend 
-REPO_PATH=$(echo "$GIT_URL" | awk -F'[:/]' '{print $(NF-1)"/"$NF}' | cut -d '.' -f 1)
-
-# 获取当前分支名称
-CURRENT_BRANCH=$(git branch --show-current)
-
-BRANCH=${1:-$CURRENT_BRANCH}
-
-# 打开 GitHub 对比页面
-open "https://github.com/$REPO_PATH/commits/$BRANCH"