Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add example usage with git difftool. #157

Merged
merged 2 commits into from
Dec 27, 2022
Merged

Add example usage with git difftool. #157

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f050eb3
Add example usage with git difftool.
ClashTheBunny Jul 19, 2021
48c5d4c
Merge branch 'main' into patch-1
afnanenayet Dec 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,22 @@ the `DIFFSITTER_CONFIG` environment variable.
*Note: the tests for this crate check to make sure the provided sample config
is a valid config.*

### Git integration

To see the changes to the current git repo in diffsitter, you can add
the following to your repo's `.git/config` and run `git difftool`.

```
[diff]
tool = diffsitter

[difftool]
prompt = false

[difftool "diffsitter"]
cmd = diffsitter "$LOCAL" "$REMOTE"
```

### Shell Completion

You can generate shell completion scripts using the binary using the
Expand Down