Review and commit changes
Changes
Section titled “Changes”Changes lists staged, unstaged, untracked and conflicted files, as a list or a tree. Untracked files sit in one tree with the unstaged ones, each with an icon for its type and its status letter. The tab shows how many files changed, in red while a conflict waits.
- Filter by search, status (added, modified, deleted, renamed, untracked, conflicted), images and All / Unstaged / Staged; the counts follow the other filters.
- Stage, Unstage and Discard appear on a file, folder or group row on hover or keyboard focus and act on the files shown.
- The right-click menu of an untracked file or folder adds it to the root
.gitignore, as one line in the working file, for you to review. - A
.ffignoreat the worktree’s root, in.gitignoresyntax, lists tracked files whose changes are expected, such as those a white-label build rewrites. Their unstaged changes stay out of the list until Show .ffignore files in the status filter menu.
The diff
Section titled “The diff”Selecting a file shows its diff with the correct before and after for staged, working and commit changes, renames included.
- Syntax colors for 35 languages, found by the file’s name, extension or
#!line. Each side is colored from its whole file where Git can read it, so a hunk inside a comment or a string reads right. - Changed words: removed lines are paired with the added lines after them, and the words that changed in each pair take a stronger tint.
- Side by side in the diff header puts removed and added lines facing each other. The diff stays unified while its pane is narrower than 800 px.
- Whitespace: the whitespace button hides changes of whitespace alone (
git diff -w). Whitespace left at the end of an added line is marked red, and tabs line up at the width the worktree’s.editorconfiggives the file. - Hunk headers name the method, function, type, Markdown heading or YAML key the hunk is in. Their button shows 20 more lines around every hunk, and Whole file shows the whole file.
- Folding: lockfiles, generated files and diffs over 3,000 lines wait behind Load diff. Wrap lines wraps long lines instead of scrolling sideways.
- Navigation: F7 and Shift+F7 (⌥↓ and ⌥↑ in the diff) move to the next or previous hunk, and past the last one to the next file. Marks at the right edge show where the changes are.
A right click on a line’s numbers offers Line history…: over the diff, who changed the line last and each commit that changed it before, following renames, 20 at a time.
Staging
Section titled “Staging”- Stage or unstage a whole file from the list.
- In a modified file’s diff, Stage hunk (or Unstage hunk) on a hunk header stages that hunk. A click on a changed line’s numbers picks it for Stage lines in a bar over the diff.
- In an unstaged diff, Discard hunk and Discard lines put those lines back to their staged version after asking, with a recovery copy first.
- Each of these checks the diff again first and changes nothing if the file moved on.
- Staging, unstaging or discarding the file you are reviewing moves to the next file.
Stage and unstage go through a change queue: files move at once and fade until Git has them, so you can stage file after file without waiting. Entries run one at a time, in order. A locked index.lock is retried for a few seconds — ffgit never deletes it — and a failure moves the files back. The Change queue menu in the file list’s toolbar shows each entry with Cancel, Retry and Dismiss.
Commit
Section titled “Commit”The composer has a summary, an optional description and the staged count. Amend is an explicit choice. A failed commit keeps your draft, and so does anything you type afterwards. Hooks and signing run exactly as configured in Git. The commit panel hides into one row under the file list from the button in the tab bar; that button, a click on the row or ⌘Enter shows it again.
The button beside the summary has your agent draft the whole message, summary and description, from the staged changes. Pick Claude Code or Codex in the menu beside it or in Coding agents settings. It runs once and read only (Plan mode, a read-only sandbox, no session kept) with ffgit’s prompt, which that settings dialog shows and lets you edit. The answer only fills the fields; a second click stops it, and the first use in a project asks first. A drafted message comes without Claude Code’s Co-Authored-By and Generated with Claude Code lines unless Agent’s co-author line in commits is on.
Before a commit, ffgit marks staged files that need a look:
- a file over the size limit (50 MiB by default, set in Cleanup › Suggestions);
- build output, by the rules of Build output in Git;
- a likely secret, found by its name (
.env,*.pem,*.p8,*.p12,id_ed25519,*private-key*…) — ffgit does not read the contents; - a file listed in
.ffignore.
Commit and Amend name them once, with the reason, and offer Commit anyway or Unstage them. Only that click unstages, and only those files.
Review notes
Section titled “Review notes”In a Changes diff, + on a line leaves a note; image review adds one on a region of a changed image, in the image’s own pixels (see image review). A note follows its line when the file changes (Moved from line N), or says Anchor needs review or Outdated. Review notes (N) lists them to resolve, edit or delete, and a click on one opens its file at its line.
- Send to chat sends a worktree’s open notes to a running chat as one message, by file and line, with crops of the image regions. The bar follows the batch until the agent takes it.
- Copy package… copies the open notes as Markdown, and Export… writes them with a JSON manifest to a folder.
- Each of them first shows the batch as it will go, where a note can be unticked for later.
Notes are kept when you quit, encrypted beside the settings with their pictures.
History, branches, conflicts and worktrees are on History and branches.