ctrl+shift+p filters: :st2 :st3 :win :osx :linux
Browse

Diffable

by yaroslavyaroslav ST3 Trending

Diff tool for Sublime Text editor

Details

Installs

  • Total 136K
  • Win 66K
  • Mac 49K
  • Linux 21K
Jun 14 Jun 13 Jun 12 Jun 11 Jun 10 Jun 9 Jun 8 Jun 7 Jun 6 Jun 5 Jun 4 Jun 3 Jun 2 Jun 1 May 31 May 30 May 29 May 28 May 27 May 26 May 25 May 24 May 23 May 22 May 21 May 20 May 19 May 18 May 17 May 16 May 15 May 14 May 13 May 12 May 11 May 10 May 9 May 8 May 7 May 6 May 5 May 4 May 3 May 2 May 1 Apr 30
Windows 1 18 9 11 6 0 0 2 7 2 2 7 4 5 4 9 4 2 2 1 1 7 7 4 3 4 1 3 5 6 5 13 1 1 1 2 3 5 6 2 1 2 7 4 3 8
Mac 1 5 6 4 5 3 2 6 7 6 11 4 3 0 1 5 11 3 4 2 1 5 4 7 3 6 2 2 6 10 7 2 6 1 1 6 2 10 5 4 2 1 4 4 4 4
Linux 0 0 3 0 0 1 2 2 1 4 1 2 1 0 0 0 5 3 0 2 0 0 1 0 4 1 1 0 5 4 0 2 3 0 0 0 4 2 2 0 1 1 2 4 1 0

Readme

Source
raw.​githubusercontent.​com

Diffable

This is a file comparison plugin for Sublime Text ¾, it relies on its internal Incremental Diff feature.

Enjoy!

Features

  1. To present inline diff of content of two opened tabs to one another.
  2. To pass the content of two opened tabs to Kaleidoscope diff app.
  3. To clear inline diff.

Installation

Please install Sublime Package Control first. Then inside Package Control: Install Package, type Diffable and then click to confirm.

Usage

It's as easy as just:

  1. Install the plugin.
  2. Open two tabs in a row either way.
  3. Hit bindings bellow or run it by Sublime Text Command Pallet by typing Diffable.
  4. Bonus: By hitting super+k followed by super+/, you'll get inline diff view provided by Sublime Text.

Screenshots

Click to see screens

Bindings

  1. To compare and show the diffs, press super + k followed by super + d.
  2. To clear the marked lines, press super + k followed by super + c.
  3. To pass presented content into Kaleidoscope app press super + k followed by super + o.

Settings

The default key binding for Mac is

{ "keys": ["super+k", "super+d"], "command": "diffable", "args": {"action": "inline"} }
{ "keys": ["super+k", "super+c"], "command": "diffable", "args": {"action": "clear"} }
{ "keys": ["super+k", "super+o"], "command": "diffable", "args": {"action": "kaleidoscope"} }

The default key binding for Windows / Linux is

{ "keys": ["ctrl+k", "ctrl+d"], "command": "diffable", "args": {"action": "inline"} }
{ "keys": ["ctrl+k", "ctrl+c"], "command": "diffable", "args": {"action": "clear"} }

Warning There's no version of Kaleidoscope app for both Windows and Linux.

Known issues

Inline diffs looks corrupted on git repos uncommited changes, to fix that please commit or reset your local changes.

Disclaimer

Note This plugin is a refactored and updated verion of an ammazing plugin https://github.com/zsong/diffy which is seems depricated long ago.

Note None of the team stand behind Kaleidoscope app have paid me any amount for being a part of this plugin behind the scene. Though they were so kind to provide me a code snippet that let me integrate with their tool in a smooth way.

Note Therefore any other diffing tool are more than welcome to become integrated on the same terms as they were — by PR to that repo.