@jswork/ushell-module-git 1.0.18 → 1.0.20

package/index.sh

@@ -53,10 +53,10 @@ alias gmdr='git merge origin/develop';
 alias gmdevr='git merge origin/dev';
 
 ## chekcout
-alias gckm='git checkout master';
-alias gckd='git checkout develop';
+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 gckdev='git checkout dev';
 
 ## git others:
 alias gs='git status ';
@@ -82,6 +82,9 @@ 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;';
 
+## move subdirs to root:
+alias mvg="${ROOT_PATH}/modules/08-mvg.sh";
+
 # git-url-cli
 # alias guc='git-url-cli'
 
@@ -91,4 +94,4 @@ alias github-cache='ssh-add ~/.ssh/id_rsa.github.com >/dev/null 2>/dev/null;';
 # git-completion
 if [ -f ~/.git-completion.bash ]; then
   . ~/.git-completion.bash
-fi
+fi

package/modules/08-mvg.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 1. get subdirectory name
+subdir=$(ls -d */ | awk '{printf $1}')
+# 2. remove .git directory
+cd $subdir && rm -rf .git && cd ..
+# 3. move all files to parent directory
+mv $subdir/{*,.[^.]*} .
+# 4. remove subdirectory
+rm -rf $subdir

package/package.json

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