@jswork/ushell-module-git 1.0.16 → 1.0.18

package/index.sh

@@ -3,13 +3,14 @@
 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 gp='git push';
 alias gpo='git push origin ';
+alias gpof='git push origin -f';
 
 # push branchs/tags/deletes
 alias gpa='git push --all -u';
@@ -28,6 +29,7 @@ alias gc1='git clone --depth=1';
 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';
@@ -45,11 +47,10 @@ 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';
+# merge from remote:
+alias gmmr='git merge origin/master';
+alias gmdr='git merge origin/develop';
+alias gmdevr='git merge origin/dev';
 
 ## chekcout
 alias gckm='git checkout master';

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.16",
+  "version": "1.0.18",
   "description": "Unix like shell module for git.",
   "main": "index.sh",
   "repository": {