Skip to content

History and branches

History draws a topological commit graph across branches, tags and remotes, with branch filtering, merge edges and pagination. Each commit is one line, as Fork draws it: lanes keep their column, the default branch keeps the first, and a merge’s subject is muted.

  • Badges tell local branches, remote-tracking branches, tags, branches checked out in another worktree and other worktrees’ detached HEADs apart. The pointer over a badge lights up its history and dims the rest.
  • Branch and HEAD badges read main ↑2 ↓1 for commits not pushed or not pulled, read from local refs; nothing is fetched.
  • A row above the graph names uncommitted changes or a merge, rebase, cherry-pick or revert in progress.
  • Branches the default branch already contains are muted and sorted last; the view menu shows or hides them. A merge’s chevron folds away the commits only its branch brings in.
  • Current and main shows HEAD, its upstream and the default branch; the view menu can also hide remote-tracking branches or follow first parents only.
  • Search history by message, author, hash, path or added or removed text.
  • Details in the commit header shows the whole message, author and committer, co-authors and the branches and tags that contain the commit.

Arrows, Page Up/Down and Home/End move the selection; Alt+Up/Down steps to a child or the first parent, Enter opens a file and Cmd/Ctrl+C copies the hash.

A click on a branch inspects its history; switching is a separate, confirmed action. A double-click on a row asks to switch to the local branch there that no other worktree has checked out, or else to the commit. The commit menu, as in Fork, has a submenu per branch at the commit and Compare and Copy submenus. From it you can compare, create branches and tags, merge, rebase, cherry-pick and revert, and open the commit on GitHub or GitLab.

A merge or rebase first says what it would do: how many commits each side has and the newest five it brings in or replays, nothing to merge, a fast-forward or a merge commit, and how many pushed commits a rebase would give new IDs.

Edit history from here… in a commit’s menu rewords, reorders (by drag or the move buttons), squashes, fixes up and splits (by files) the current branch’s commits that no other branch, tag, remote or worktree has.

  • A review shows the exact before and after, with changed messages as the repository’s commit-msg hook leaves them.
  • Nothing changes until Rewrite, and the branch moves only from the tip the review saw.
  • A recovery copy keeps the old commits; Backups can make them again as a branch.
  • Pushed commits, merges and shared commits are refused, with the reason.

Fetch, pull, push and clone say in the header what Git is doing and how far it is (Pulling from origin/main · Receiving objects 45%).

  • Pull is fast-forward only. With local changes it offers cancel, review, fetch only or Save and pull, which keeps them in a stash meanwhile.
  • When the branch and its upstream have diverged, Pull says so (main and origin/main have diverged: 1 commit here, 2 on origin/main) and offers Rebase onto origin/main or Merge origin/main, after a recovery copy.
  • Saved changes that would conflict with the updated branch are worked out first without touching files; the bar names them and Restore and resolve… writes their conflicts for you to resolve.
  • A GitHub or GitLab profile can carry an SSH key or a saved token, used for that Git process only.

An unfinished merge, rebase, cherry-pick or revert gets a bar over the window: Resolve conflicts while a conflict is left, Abort…, Skip commit… and Continue… once none is, each confirmed and after a recovery copy. A stop on conflicts is not shown as an error; when you started it from this window, the first conflict opens in Changes.

  • In Changes the file shows with line numbers and syntax colors, each conflict a card that takes Current, Incoming, both, the base or text you write. Three columns (Current · Result · Incoming) or the whole result as text are a click away.
  • ⌥↑ and ⌥↓ move between conflicts. Mark resolved writes only once no conflict is left.
  • Open in sends the file to an installed or Git-configured merge tool, and its result comes back for review. Merge tools… picks the tool for one repository or all.
  • Resolve with agent… on the bar puts a task for the conflicts left into a chat’s message box, in this worktree only. You read, edit and send it, then review and continue yourself.
  • A file whose markers were removed outside ffgit, by an agent or an editor, is read against the conflict Git wrote, so you review each conflict it resolved. Files the agent staged stay under Resolved until the operation ends.

Activity’s Needs you lists each worktree stopped on conflicts, with Show conflicts and Resolve with agent….

  • Switch or create branches, with a confirmation before switching. The branch menu renames and deletes local branches and sets or removes their upstream.
  • The sidebar lists your branches apart from agents’ (claude/, codex/ and prefixes you add), and agents’ branches by whether the default branch has them already.
  • Discover, create and open linked worktrees. A new worktree checks out its submodules (All, the default, Top level or None).
  • Sidebar rows say what only a worktree holds (2 not pushed, 1 not on any branch) or that its work is already in the default branch (In main). When two worktrees change the same file, both name the other — an early warning of a merge conflict.
  • Start agent task… in a branch’s menu opens New chat about that branch, in the worktree that has it checked out or a new one that starts from it. See Agents.
  • Keep the default branch current, offered once in a project whose default branch has an upstream and off until you turn it on, fetches every 15 minutes and fast-forwards the default branch so new worktrees start fresh: only while it is checked out with nothing changed and no commits of its own, never a merge.

Stack on… in a branch’s menu sets the branch it builds on, and Unstack removes the link. The sidebar then lists a stacked branch under its parent with its state: on a, a has 3 new commits, a was rewritten, a is in main or a is gone.

  • Bring b up to a… merges the parent into a stacked branch that fell behind, with the usual merge review.
  • Restack b onto a… replays a branch’s own commits, and those of every branch stacked on it, when no remote, tag or other branch has them. It is worked out in memory first, reviewed, and then run after a recovery copy pins every old tip. Nothing is pushed. Restacking needs Git 2.40 or newer.
  • Create pull / merge request… from a stacked branch bases it on the parent, and Review offers Change base to main… once the parent’s request has merged.

Open in in the header (and in the sidebar’s project and worktree menus) opens the worktree in Terminal, iTerm, Warp or Ghostty, in Finder, or in an installed editor such as VS Code, Cursor, Antigravity, Windsurf, Zed, Sublime Text or a JetBrains IDE. View on GitHub or View on GitLab opens the upstream branch’s page.

Visible repositories refresh from Git operations, file system events and a two-second status poll; windows in the background pause their watchers.