@jswork/ushell-module-git 1.0.29 → 1.0.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.sh +4 -1
- package/package.json +1 -1
package/index.sh
CHANGED
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
## path:
|
|
3
3
|
ROOT_PATH=$(dirname $BASH_SOURCE);
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
# 这个与我的命令 github-flow 冲突，所以暂时不用了
|
|
6
|
+
# source $ROOT_PATH/modules/02-git-flow.sh;
|
|
6
7
|
source $ROOT_PATH/modules/07-git-rebase.sh;
|
|
7
8
|
|
|
8
9
|
## git base:
|
|
@@ -37,10 +38,12 @@ alias gfp='git fetch --all --prune';
|
|
|
37
38
|
|
|
38
39
|
## git revert:
|
|
39
40
|
alias gr='git checkout -f';
|
|
41
|
+
alias grf='git clean -fd';
|
|
40
42
|
alias gck='git checkout ';
|
|
41
43
|
alias g-='git checkout -';
|
|
42
44
|
alias gcy='git cherry-pick';
|
|
43
45
|
|
|
46
|
+
|
|
44
47
|
# merge:
|
|
45
48
|
alias gm='git merge ';
|
|
46
49
|
alias gmm='git merge master';
|