You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
docs: update CHANGELOG and README for Phase 3 features
Add documentation for new rebase features:
- Progress reporting during chain rebase
- Summary report after rebase completion
- --status flag for viewing in-progress rebase state
- --cleanup-backups flag for deleting backup branches
- New integration tests
Update README with flag descriptions, usage examples, and a new
"Progress Reporting and Summary" section with sample output.
Copy file name to clipboardExpand all lines: README.md
+52Lines changed: 52 additions & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -118,6 +118,18 @@ Git Chain's rebase command offers customization through its flags:
118
118
```
119
119
Rolls back the entire chain rebase by restoring all branches to their original positions before the rebase started. Aborts any in-progress git rebase and cleans up the state file.
120
120
121
+
-**`--status`**: Show the current chain rebase state
122
+
```
123
+
git chain rebase --status
124
+
```
125
+
Displays the status of each branch in an ongoing chain rebase, including which branches have been completed, skipped, or are still pending. Reports "No chain rebase in progress" when no state file exists.
126
+
127
+
-**`--cleanup-backups`**: Delete backup branches after successful rebase
128
+
```
129
+
git chain rebase --cleanup-backups
130
+
```
131
+
After a successful rebase, automatically deletes any `backup-<chain>/<branch>` branches that were created during squash-merge reset. Can also be combined with `--continue` and `--skip`.
132
+
121
133
-**`--squashed-merge=<mode>`**: How to handle branches detected as squash-merged
122
134
```
123
135
git chain rebase --squashed-merge=reset # Default: auto-backup + reset to parent
0 commit comments