Launch difftool

bash

git difftool main..feature/my-change

Learn the surrounding workflow

Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.

Same sheet · prioritizing Diff and Merge Tools

Skip confirmation before launching external difftool.

Open In sheetbashsame section

Set preferred merge tool name.

Open In sheetbashsame section

Define command for the merge tool.

Open In sheetbashsame section

Open merge tool for unresolved conflicts.

Open In sheetbashsame section

Override global identity in one repository.

Fail pull if it would create a merge commit.