Commit History

Shows the commits on your current branch, newest first.

You can do the following rebase operations:

• To select multiple commits, click the first one and shift-click the second. All commits in between will be selected. Press Escape to unselect.
• Drag one or more commits up or down to reorder them. Press Escape to cancel.
• Hover a commit to reveal the Fixup button, which folds that commit into the one below it, discarding its commit message.
• When two or more commits are selected, click the Squash button to combine them into a single commit where the commit message is the combined messages of all the commits.
• Right-click a commit to open a context menu with the following actions:
  • Edit commit message — edit the message in place. Press Ctrl+Enter (Cmd+Enter on Mac) to confirm, or Escape to cancel.
  • Create new branch — create a new branch pointing to that commit.
  • Reset branch to here — hard-reset the current branch to that commit.
  • Delete Branch — delete a local branch (available when right-clicking a branch badge).
• Select a single commit, then in the diff pane click the files you want to move out and click the Split Commit button. The commit is split into two — the unselected files, then the selected files — each keeping the original message.

If a rebase produces a merge conflict, a dialog will appear letting you resolve the conflict in your editor and then continue, or abort and return to the original state.

Tip: drag related commits together first, then use squash or fixup.

Undo Stack

The Undo Stack holds each past tip of your local branch, sorted chronologically. It begins when the local branch was created.

Each of the following actions moves the current branch and updates the Commit History pane:

• Undo go one step backwards in the Undo Stack.
• Redo go one step forward in the Undo Stack.
• Double-click an entry to reset the branch to that state.

The Undo Stack contains only unique modifications to the branch. If a branch is reset to a previous state, the new tip of the branch is not unique and will not be an entry in the Undo Stack. Undo, Redo and Reset actions are non-unique modifications and are not added as new entries to the Undo Stack.

The Undo Stack shows the local branch changes — commits, rebases, resets — regardless of whether they were made inside or outside git-warp.

When you pull or fetch/rebase from the remote, the update to the local branch appears as a single entry in the Undo Stack, not as a series of individual remote commits.

Tip: A failed rebase can be recovered by executing "git rebase --abort".