@jswork/ushell-module-git 1.0.17 → 1.0.18
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 +8 -1
- package/package.json +1 -1
package/index.sh
CHANGED
|
@@ -7,9 +7,10 @@ source $ROOT_PATH/modules/07-git-rebase.sh;
|
|
|
7
7
|
|
|
8
8
|
## git base:
|
|
9
9
|
alias gl='git pull';
|
|
10
|
-
alias gp='git push';
|
|
11
10
|
alias glo='git pull origin ';
|
|
11
|
+
alias gp='git push';
|
|
12
12
|
alias gpo='git push origin ';
|
|
13
|
+
alias gpof='git push origin -f';
|
|
13
14
|
|
|
14
15
|
# push branchs/tags/deletes
|
|
15
16
|
alias gpa='git push --all -u';
|
|
@@ -28,6 +29,7 @@ alias gc1='git clone --depth=1';
|
|
|
28
29
|
alias gcf='git clean -f';
|
|
29
30
|
|
|
30
31
|
# git fetch:
|
|
32
|
+
alias gfo='git fetch origin';
|
|
31
33
|
alias gft='git fetch';
|
|
32
34
|
alias gfa='git fetch --all';
|
|
33
35
|
alias gfp='git fetch --all --prune';
|
|
@@ -45,6 +47,11 @@ alias gmm='git merge master';
|
|
|
45
47
|
alias gmd='git merge develop';
|
|
46
48
|
alias gmdev='git merge dev';
|
|
47
49
|
|
|
50
|
+
# merge from remote:
|
|
51
|
+
alias gmmr='git merge origin/master';
|
|
52
|
+
alias gmdr='git merge origin/develop';
|
|
53
|
+
alias gmdevr='git merge origin/dev';
|
|
54
|
+
|
|
48
55
|
## chekcout
|
|
49
56
|
alias gckm='git checkout master';
|
|
50
57
|
alias gckd='git checkout develop';
|