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

Diffable

by yaroslavyaroslav ST3

Diff tool for Sublime Text editor

Details

Installs

  • Total 138K
  • Win 67K
  • Mac 49K
  • Linux 22K
Dec 23 Dec 22 Dec 21 Dec 20 Dec 19 Dec 18 Dec 17 Dec 16 Dec 15 Dec 14 Dec 13 Dec 12 Dec 11 Dec 10 Dec 9 Dec 8 Dec 7 Dec 6 Dec 5 Dec 4 Dec 3 Dec 2 Dec 1 Nov 30 Nov 29 Nov 28 Nov 27 Nov 26 Nov 25 Nov 24 Nov 23 Nov 22 Nov 21 Nov 20 Nov 19 Nov 18 Nov 17 Nov 16 Nov 15 Nov 14 Nov 13 Nov 12 Nov 11 Nov 10 Nov 9 Nov 8
Windows 4 2 4 8 11 6 9 6 1 4 6 5 2 5 6 2 4 8 8 7 5 7 1 2 4 6 0 0 0 0 2 7 6 7 3 8 3 3 8 0 0 6 4 0 0 4
Mac 4 1 0 8 6 6 4 5 1 3 3 10 6 5 6 0 1 3 7 6 5 9 1 1 5 3 0 0 0 0 1 7 9 2 0 7 0 0 2 0 0 6 4 4 2 0
Linux 1 0 1 3 1 1 1 2 2 0 2 0 0 1 1 2 0 2 2 1 1 1 1 2 0 0 0 0 0 0 0 1 2 0 0 6 0 2 2 0 0 0 2 1 3 3

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.