Interactive Rebase
Rewrite commit history: reword, squash, fixup, reorder or drop commits
Interactive rebase rewrites your own history before you push it: reword messages, squash several commits into one, reorder them, or drop the unwanted ones. GitBor replaces the text file you'd edit from the terminal with a visual editor.
Starting a rebase
Right-click a commit in the graph → Interactively Rebase '<branch>' to Here…. The editor opens with the commits from that point up to HEAD.
Actions
Pick one action per commit:
| Action | What it does |
|---|---|
| pick | Apply the commit as-is. |
| reword | Apply, then open the message editor. |
| edit | Apply and stop, so you can amend. |
| squash | Merge into the previous commit, combining messages. |
| fixup | Merge into the previous commit, discarding this message. |
| drop | Remove the commit from history. |
Drag rows to reorder commits — the same as reshuffling lines in git rebase -i.
Rebase progress
Once the rebase runs, a banner appears at the top of the window:
- The current step (e.g. "Rebasing: step 3 of 7").
- Continue — proceed after an edit or a resolved conflict.
- Skip — skip the current commit.
- Abort — cancel the whole rebase and return HEAD to where it started.
If a conflict occurs, GitBor switches you to the Merge Editor for the conflicting files. Resolve them, then click Continue.
Safety
Before starting, GitBor:
- Records the current HEAD, so you can return to it from Repository → More → Reflog… (see Reflog).
- Auto-stashes any uncommitted changes.
- Journals the operation start.
If the app is killed mid-rebase, GitBor shows a recovery dialog on the next launch — continue, abort, or forget the operation. See Data Protection.