Skip to content

ff diff

Show uncommitted work as a patch against the commit below the open change. With no paths, include the whole eligible change, including newly created untracked files.

Usage

Usage: ff diff [OPTIONS] [path]...

Examples

ff diff                         # Whole open change
ff diff src/                    # Changes under src/
ff diff --json                  # Hunks and lines as fields
ff diff > fix.patch             # Save a patch for git apply
ff status                       # File counts instead of a patch
ff op diff '@^' @               # Compare two recorded file trees

Options

Arguments:
  [path]...
          Files or directories to limit the patch to; all of them when omitted

Options:
      --json
          Emit machine-readable JSON

      --fetch
          Fetch now on commands that support fetching, regardless of cadence

      --no-fetch
          Skip the fetch: read the tracking refs as they stand

      --session <name>
          Session name for this invocation

  -C, --cwd <dir>
          Run as if fufu had been started in <dir>

  -h, --help
          Print help (see a summary with '-h')

Paths and output

Paths select files or directory prefixes, without globs. Snapshot exclusions apply, including ignored untracked files and content above fufu.maxFileSize.

Text output is a unified diff suitable for git apply. It does not repeat the diffstat from ff status. ff show adds the revision's identity and message to the patch; ff commit records eligible working changes in branch history.