@jswork/ushell-module-git 1.0.15 → 1.0.17

package/index.sh

@@ -3,10 +3,10 @@
 ROOT_PATH=$(dirname $BASH_SOURCE);
 
 source $ROOT_PATH/modules/02-git-flow.sh;
+source $ROOT_PATH/modules/07-git-rebase.sh;
 
 ## git base:
 alias gl='git pull';
-alias glb='git pull --rebase';
 alias gp='git push';
 alias glo='git pull origin ';
 alias gpo='git push origin ';
@@ -45,12 +45,6 @@ alias gmm='git merge master';
 alias gmd='git merge develop';
 alias gmdev='git merge dev';
 
-## rebase
-alias grb='git rebase ';
-alias grbm='git rebase master';
-alias grbd='git rebase develop';
-alias grbdev='git rebase dev';
-
 ## chekcout
 alias gckm='git checkout master';
 alias gckd='git checkout develop';

package/modules/01-gcd.sh

@@ -6,7 +6,7 @@ repourl=`echo $GIT_URL | awk -F [:/] '{print$1}'`;
 
 # A special case for nono `aric-` org.
 
-if [[ $orgname != "aric-"* || $orgname != "alo7i" ]]; then
+if [[ $orgname != "aric-"* && $orgname != "alo7i" ]]; then
     orgname="github";
 fi
 

package/modules/06-git-clean.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-#!/bin/bash
-
 # Delete local tags
 git tag -l | xargs git tag -d
 

package/modules/07-git-rebase.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+## rebase
+alias grb='git rebase ';
+alias gmb='git rebase ';
+alias grbm='git rebase master';
+alias grbd='git rebase develop';
+alias grbdev='git rebase dev';
+
+# git pull
+alias glb='git pull --rebase';

package/package.json

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