git-branchless-difftool(1)

📦
version 0.11.1 · 2 versions
, in arch rolling, nixpkgs unstable

💖 NAME 💖

Okay so welcome to the git-branchless-difftool(1) page from the General Commands Manual, bestie. The command is difftool — it uses the partial commit selector UI as a Git-compatible difftool; see git-difftool(1) for more information on Git difftools. No cap, that's the whole name vibe.

✨ SYNOPSIS ✨

difftool [-d|--dir-diff] [--read-only] [-N|--dry-run] [-b|--base]
[-o|--output] [-h|--help] <LEFT> <RIGHT>

🦋 DESCRIPTION 🦋

Use the partial commit selector UI as a Git-compatible difftool; see git-difftool(1) for more information on Git difftools.

Like, literally that's the flex: this thing lets you use that partial commit selector UI as a Git-compatible difftool. If you want the deeper Git difftool lore, git-difftool(1) is right there 💅

🎀 OPTIONS 🎀

  • -d, --dir-diff — instead of comparing two files, compare two directories recursively. Directory-on-directory comparison, iconic ✨
  • --read-only — disable all editing controls and do not write the selected commit contents to disk. It's giving look-but-don't-touch 🫶
  • -N, --dry-run — show what would have been written to disk as part of the commit selection, but do not actually write it. Preview era, no accidental file writes 💅
  • -b, --base <BASE> — render the interface as a mergetool instead of a difftool and use this file as the base of a three-way diff as part of resolving merge conflicts.
  • -o, --output <OUTPUT> — write the resolved merge conflicts to this file.
  • -h, --help — print help.
  • <LEFT> — the left-hand file to compare (or directory if --dir-diff is passed).
  • <RIGHT> — the right-hand file to compare (or directory if --dir-diff is passed).

Cute sign-off 🎀: the source/version is difftool, the manual is git-branchless-difftool(1), and the original footer didn't print a date, so I'm not inventing one — periodt 💖

📦 where this page comes from