Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Command: git branchless difftool

kain88-de edited this page May 4, 2024 · 6 revisions

Description

Available since v0.8.0.

The git branchless difftool subcommand exposes an interactive interface to view diffs. You can integrate it into Git by setting it as a difftool or mergetool. Here's what it looks like:

Screenshot 2023εΉ΄08月31ζ—₯ at 16 05 26

Usage

Example configuration for your .gitconfig:

[difftool "branchless"]
 cmd = git-branchless difftool --read-only --dir-diff $LOCAL $REMOTE
[mergetool "branchless"]
 cmd = git-branchless difftool $LOCAL $REMOTE --base $BASE --output $MERGED

Then you can invoke it instead of git diff via a command like this (you may want to create a more usable alias for yourself):

$ git difftool --tool 'branchless' --dir-diff HEAD~

Clone this wiki locally

AltStyle γ«γ‚ˆγ£γ¦ε€‰ζ›γ•γ‚ŒγŸγƒšγƒΌγ‚Έ (->γ‚ͺγƒͺγ‚ΈγƒŠγƒ«) /