@jswork/ushell-module-git 1.0.62 → 1.0.64
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 +2 -1
- package/modules/14-gr.sh +4 -3
- package/package.json +1 -1
- package/.idea/modules.xml +0 -8
- package/.idea/ushell-module-git.iml +0 -12
- package/.idea/vcs.xml +0 -6
package/index.sh
CHANGED
|
@@ -22,7 +22,8 @@ alias glg2="git log --oneline --decorate --all"
|
|
|
22
22
|
|
|
23
23
|
alias gpo='git push origin '
|
|
24
24
|
alias gpom='git push origin main'
|
|
25
|
-
alias gpof='git push origin -
|
|
25
|
+
alias gpof='git push origin --force-with-lease'
|
|
26
|
+
alias gpoff='git push origin -f'
|
|
26
27
|
|
|
27
28
|
# push branchs/tags/deletes
|
|
28
29
|
alias gpa='git push --all -u'
|
package/modules/14-gr.sh
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
#!/usr/bin/env bash
|
|
2
2
|
|
|
3
3
|
gr() {
|
|
4
|
-
# 当没有传值的时候，即为 "."
|
|
5
4
|
if [ $# -eq 0 ]; then
|
|
6
|
-
|
|
5
|
+
# 作用于当前目录，丢弃所有本地变更（包括已暂存的）
|
|
6
|
+
git restore --source=HEAD --staged --worktree -- .
|
|
7
7
|
else
|
|
8
|
-
|
|
8
|
+
# 作用于指定路径，丢弃所有本地变更（包括已暂存的）
|
|
9
|
+
git restore --source=HEAD --staged --worktree -- "$@"
|
|
9
10
|
fi
|
|
10
11
|
}
|
package/package.json
CHANGED
package/.idea/modules.xml
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<project version="4">
|
|
3
|
-
<component name="ProjectModuleManager">
|
|
4
|
-
<modules>
|
|
5
|
-
<module fileurl="file://$PROJECT_DIR$/.idea/ushell-module-git.iml" filepath="$PROJECT_DIR$/.idea/ushell-module-git.iml" />
|
|
6
|
-
</modules>
|
|
7
|
-
</component>
|
|
8
|
-
</project>
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<module type="WEB_MODULE" version="4">
|
|
3
|
-
<component name="NewModuleRootManager">
|
|
4
|
-
<content url="file://$MODULE_DIR$">
|
|
5
|
-
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
|
6
|
-
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
|
7
|
-
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
|
8
|
-
</content>
|
|
9
|
-
<orderEntry type="inheritedJdk" />
|
|
10
|
-
<orderEntry type="sourceFolder" forTests="false" />
|
|
11
|
-
</component>
|
|
12
|
-
</module>
|