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
# Rebase stack branches without pulling from or rebasing with trunk
668
+
gh stack rebase --no-trunk
669
+
666
670
# After resolving a conflict: stage files with `git add`, then:
667
671
gh stack rebase --continue
668
672
@@ -674,6 +678,7 @@ gh stack rebase --abort
674
678
|------|-------------|
675
679
|`--downstack`| Only rebase branches from trunk to the current branch |
676
680
|`--upstack`| Only rebase branches from the current branch to the top |
681
+
|`--no-trunk`| Skip trunk — only rebase stack branches onto each other (no fetch, no trunk rebase) |
677
682
|`--continue`| Continue after resolving conflicts |
678
683
|`--abort`| Abort and restore all branches |
679
684
|`--remote <name>`| Remote to fetch from (use if multiple remotes exist) |
@@ -688,6 +693,8 @@ gh stack rebase --abort
688
693
689
694
**Rerere (conflict memory):**`git rerere` is enabled by `init` so previously resolved conflicts are auto-resolved in future rebases.
690
695
696
+
**No-trunk mode:** Use `--no-trunk` to skip fetching from the remote and rebasing with the trunk branch. Only inter-branch rebases are performed (branch 2 onto branch 1, branch 3 onto branch 2, etc.). Useful when you only need to align stack branches with each other without pulling upstream changes.
0 commit comments