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.

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

Add diff tool command explanation to README.md #375

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ You can install this like any other Atom package, with one of these methods:
- Enter the directory
- Run `apm install`

## Configuration

- [Diff tool command](https://github.com/yongkangchen/remote-sync#diff-tool-command)

## Usage

You can configure remote sync a couple of ways:
Expand Down Expand Up @@ -218,6 +222,39 @@ The `.remote-sync.json` in your project root will use these options:
]
}
```
## Diff tool command

You can use any GUI app which takes two arguments without parameters like **meld** or **gvimdiff**.

If you want to use app with parameters or console app, try this:

- **code** (visual studio code)

create shell script `atom-diff-code` in `/usr/local/bin/` with command

```
#!/bin/bash
code -d -n --disable-extensions $1 $2
```

Then set `atom-diff-code` in Diff tool command setting in remote-sync in atom

- **vim** in Ubuntu:

`atom-diff-vimdiff`

```
#!/bin/bash
gnome-terminal -x bash -c "vimdiff $1 $2"
```
- **diff** in Ubuntu:

`atom-diff-diff`

```
#!/bin/bash
gnome-terminal -x bash -c "diff $1 $2; exec bash"
```

# Make a donation via Paypal ![Make a donation via Paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)

Expand Down