@jswork/ushell-module-git 1.0.42 → 1.0.44

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.
Files changed (3) hide show
  1. package/modules/07-git-rebase.sh +3 -6
  2. package/modules/10-fixup.sh +2 -0
  3. package/package.json +1 -1
package/modules/07-git-rebase.sh CHANGED
@@ -1,11 +1,8 @@
1
1
  #!/usr/bin/env bash
2
2
 
3
- ## rebase
4
- alias grb='git rebase ';
5
- alias gmb='git rebase ';
6
- alias grbm='git rebase master';
7
- alias grbd='git rebase develop';
8
- alias grbdev='git rebase dev';
3
+ # git rebase c/a
4
+ alias gbc='git rebase --continue';
5
+ alias gba='git rebase --abort';
9
6
 
10
7
  # git pull
11
8
  alias glb='git pull --rebase';
package/modules/10-fixup.sh CHANGED
@@ -19,4 +19,6 @@ if [ -z "$BASE_COMMIT" ]; then
19
19
  fi
20
20
 
21
21
  # 执行交互式变基
22
+ git add .
23
+ git commit --fixup=$TARGET_COMMIT
22
24
  git rebase -i --autosquash $BASE_COMMIT
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jswork/ushell-module-git",
3
- "version": "1.0.42",
3
+ "version": "1.0.44",
4
4
  "description": "Unix like shell module for git.",
5
5
  "main": "index.sh",
6
6
  "repository": {