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

Diffable

by yaroslavyaroslav ST3

Diff tool for Sublime Text editor

Details

Installs

  • Total 137K
  • Win 66K
  • Mac 49K
  • Linux 21K
Jul 26 Jul 25 Jul 24 Jul 23 Jul 22 Jul 21 Jul 20 Jul 19 Jul 18 Jul 17 Jul 16 Jul 15 Jul 14 Jul 13 Jul 12 Jul 11 Jul 10 Jul 9 Jul 8 Jul 7 Jul 6 Jul 5 Jul 4 Jul 3 Jul 2 Jul 1 Jun 30 Jun 29 Jun 28 Jun 27 Jun 26 Jun 25 Jun 24 Jun 23 Jun 22 Jun 21 Jun 20 Jun 19 Jun 18 Jun 17 Jun 16 Jun 15 Jun 14 Jun 13 Jun 12 Jun 11
Windows 5 4 5 7 4 1 2 3 2 7 2 6 4 0 4 8 7 2 8 1 3 6 11 5 3 3 0 0 3 8 6 7 6 2 3 5 6 4 6 11 1 3 4 18 9 11
Mac 3 8 5 8 4 3 2 5 6 5 1 6 2 2 1 10 3 6 4 2 1 1 1 4 2 2 1 3 5 8 3 7 2 1 3 1 2 7 9 3 2 1 4 5 6 4
Linux 1 0 2 1 1 0 0 2 2 2 1 3 1 0 1 0 2 2 1 1 3 2 2 1 2 5 2 1 4 2 0 1 2 0 0 1 3 0 1 2 0 3 2 0 3 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.