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

Diffable

by yaroslavyaroslav ST3

Diff tool for Sublime Text editor

Details

Installs

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

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.