Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: master
Commits on Apr 21, 2014
  1. @sorbits

    Treat lines starting with ‘#’ as comments

    sorbits authored
    When editing a diff via git there will often be comments intermixed with chunks of added, deleted, and context lines. E.g. “git add -p” followed by edit.
Commits on Oct 2, 2013
  1. @sorbits

    Set default extension for new files to ‘.patch’

    sorbits authored
    Generally when saving a diff file it’s to submit it as a patch.
Commits on Sep 4, 2013
  1. @infininight
Commits on Aug 5, 2013
  1. @infininight

    Prevent false positive grammar match with YAML files

    infininight authored
    Require a character other than a newline to follow "--- " to prevent matching YAML files starting with an array or dictionary.
Commits on Mar 4, 2013
  1. @infininight
Commits on Feb 22, 2013
  1. @infininight

    Match git hashes longer than 7 characters

    infininight authored
    This may happen if 7 characters is not enough to provide ambiguity.
  2. @slottermoser

    Update Syntaxes/Diff.plist to recognize .rej files

    slottermoser authored
    When using the command `git apply --reject *.patch`, rejected hunks that do not apply will be saved to a .rej file. This file just contains file diff hunks, so it would be useful for it to be syntax highlighted as such.
Commits on Feb 6, 2013
  1. @sorbits

    Don’t use ‘tr’ to strip CR line endings

    sorbits authored
    We pass --strip-trailing-cr to the diff command so there is no need for manually stripping the CR characters.
    
    Closes #2.
  2. @sorbits

    Don’t force a text encoding for shell commands

    sorbits authored
    This used to be required to have the clipboard shell commands work with UTF-8 but these have since been updated to default to UTF-8.
  3. @sorbits

    Use TextMate’s display name for untitled documents

    sorbits authored
    Also remove use of rescan_project (as this is a no-op in 2.0).
Commits on Jan 15, 2013
  1. @infininight
Commits on Oct 1, 2012
  1. @infininight
Commits on Sep 8, 2012
  1. @infininight
Commits on Nov 12, 2011
  1. @infininight

    Update readme.

    infininight authored
Commits on Oct 5, 2011
  1. @bradchoate
  2. @bradchoate
Commits on Oct 26, 2008
  1. @torsten
Commits on Apr 12, 2008
  1. @subtleGradient

    Added code folding when there are multiple documents listed in the di…

    subtleGradient authored
    …ff. Makes it much easier to read.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@9370 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Mar 18, 2008
  1. @sorbits

    • update commands to show “There are no differences.” when there are …

    sorbits authored
    …no differences. Also a few other minor improvements, like aborting the file requester no longer shows an error message, etc.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@9155 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Feb 22, 2008
  1. @infininight

    Tighten up the firstLineMatch for the context diff format, was catchi…

    infininight authored
    …ng various maude files.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@8977 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Nov 4, 2007
  1. @sorbits

    • update my email address (from a throw-away address to something a l…

    sorbits authored
    …ittle more permanent)
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@8398 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Jun 19, 2007
  1. @sorbits

    • rewrite first line match pattern to be extended (and thus split int…

    sorbits authored
    …o multiple lines) and add detect of “diff --git”
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@7545 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Jun 4, 2007
  1. @sorbits
Commits on May 9, 2007
  1. @infininight
Commits on May 5, 2007
  1. @sorbits

    • add ‘--strip-trailing-cr’ since the document (which we diff against…

    sorbits authored
    …) will never have these — if the data diff’ed against uses only CR, then the diff will still fail, but it now works for when it uses CRLF.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@7136 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Apr 5, 2007
  1. @sorbits
  2. @sorbits

    • use proper Title Case (as defined by Apple, i.e. uppercase ‘From’)

    sorbits authored
    • use rescan_project instead of activating Finder and then TextMate (this prevents Finder windows to go to the front, and rescan_project can easily be made a no-op in 2.0 :) )
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6949 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Mar 21, 2007
  1. @canadaduane

    Added 'Apply Patch from Clipboard' command to Diff bundle. (Apologies…

    canadaduane authored
    … if I missed a conversation about this... it just seems really useful to me.)
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6863 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Mar 4, 2007
  1. @sorbits

    Add the following keys to the bundle’s info.plist:

    sorbits authored
    contactName:
       The full name of the contact for this bundle.
    contactEmailRot13:
       A ROT13 encoded email address for the bundle contact (we obfuscate it to avoid spammers from picking up the files, seeing how bundles will often be available via anonymous svn over http).
    description:
       A short description for this bundle. Do link to more info about the language (or whatever) the bundle is about. I decided on using HTML for this (but leave out the initial paragraph tag) since it seemed like overkill to run a single line of text through Markdown.pl, just to convert [foo](link) into <a href="link">foo</a>
    
    Many of the current descriptions could use some improvements, I just wanted to get the ball rolling :)
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6718 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Mar 2, 2007
  1. @sorbits

    • provide diff with appropriate labels for the two input sources bein…

    sorbits authored
    …g compared
    
    • change Document With Clipboard to Document / Selection With Clipboard
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6699 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Feb 13, 2007
  1. @sorbits

    • give ‘-p0’ as option to patch. This makes it use the full path spec…

    sorbits authored
    …ified in the diff file, rather than just the filename.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6574 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Nov 10, 2006
  1. @sorbits

    • exclude the +++/--- lines when calculating statistics (thanks to Gr…

    sorbits authored
    …ant Hollingworth)
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6058 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Sep 9, 2006
  1. @sorbits
Commits on Sep 3, 2006
  1. @infininight
Commits on Sep 2, 2006
  1. @infininight
Something went wrong with that request. Please try again.