Skip to content

Instantly share code, notes, and snippets.

@mystor
Last active May 9, 2026 18:33
Show Gist options
  • Select an option

  • Save mystor/e7a2e865d4be3028d763ccca0a2d4335 to your computer and use it in GitHub Desktop.

Select an option

Save mystor/e7a2e865d4be3028d763ccca0a2d4335 to your computer and use it in GitHub Desktop.
jj git-index diff editor
# To be added to .config/jj/config.toml
# A diff editor --tool to automatically select the contents of the git index.
[merge-tools.git-index]
diff-args = [] # disable using as a diff viewer
edit-args = ["--work-tree=$output", "checkout", "--", "."]
program = "git"
# Can be used with jj commit, split, and squash
[aliases]
icommit = ["commit", "--tool", "git-index"]
isplit = ["split", "--tool", "git-index"]
isquash = ["squash", "--tool", "git-index"]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment