git-stack-cli 1.12.0 → 1.13.1

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 (21) hide show
  1. package/README.md +11 -1
  2. package/dist/cjs/index.cjs +543 -460
  3. package/package.json +1 -1
  4. package/src/app/AutoUpdate.tsx +5 -3
  5. package/src/app/CherryPickCheck.tsx +4 -4
  6. package/src/app/Debug.tsx +12 -9
  7. package/src/app/DependencyCheck.tsx +0 -6
  8. package/src/app/Main.tsx +4 -0
  9. package/src/app/ManualRebase.tsx +85 -357
  10. package/src/app/PreManualRebase.tsx +6 -5
  11. package/src/app/RebaseCheck.tsx +3 -3
  12. package/src/app/Store.tsx +8 -0
  13. package/src/app/SyncGithub.tsx +322 -0
  14. package/src/command.ts +0 -16
  15. package/src/commands/Rebase.tsx +31 -21
  16. package/src/core/GitReviseTodo.ts +3 -3
  17. package/src/core/github.tsx +18 -9
  18. package/src/core/read_json.ts +3 -3
  19. package/src/core/safe_exists.ts +10 -0
  20. package/src/core/safe_rm.ts +10 -0
  21. package/src/index.tsx +4 -1
package/README.md CHANGED
@@ -59,7 +59,7 @@ git stack help # print a table of all CLI arguments
59
59
  Sometimes you want to add changes to an existing commit or pull request.
60
60
  With `git-stack` this is as simple as amending the commit.
61
61
 
62
- 1. `git add` your changes to the stage
62
+ 1. `git add -p` your changes to the stage
63
63
  2. `git stack log` to find the relative commit number you want to amend
64
64
  3. `git stack fixup <number>` to amend the specific commit with your staged changes.
65
65
 
@@ -73,6 +73,16 @@ git stack fixup 2
73
73
 
74
74
  Running `git stack` afterward will update any existing pull requests with your changes.
75
75
 
76
+ ### Syncing with remote
77
+
78
+ To update your local branch with the latest changes in the remote branch (e.g. `master`, `main`)
79
+
80
+ > <img alt="git stack rebase demo" src="https://github.com/user-attachments/assets/44a39be7-cd6b-4c5a-ac85-be010b7665aa" />
81
+
82
+ ```bash
83
+ git stack rebase
84
+ ```
85
+
76
86
  ## Why?
77
87
 
78
88
  The goal of `git stack` is to combine the **simplicity of developing in a single branch** in order to **preserve your commit history** while also **grouping commits into pull requests for code review**.