Permalink
Switch branches/tags
Nothing to show
Commits on Jan 9, 2017
  1. Correct punctuation.definition.inserted.diff

    It was added to all three of markup.{inserted,changed,deleted}.diff,
    which can cause unexpected highlighting if separate rules for the
    punctuation.definition are added.
    kivikakk committed Jan 9, 2017
Commits on Aug 31, 2016
  1. Import in merge conflict commands

    Originally part of the Subversion these have been re-scoped to function on any file. The scope will allow these commands to work on any file but be overridden by any other item with the same shortcut. However on currently SCM conflicted files the commands will take precedence.
    infininight committed Aug 31, 2016
  2. Cleanup info.plist

    infininight committed Aug 31, 2016
Commits on Apr 21, 2014
  1. Treat lines starting with ‘#’ as comments

    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.
    sorbits committed Apr 21, 2014
Commits on Oct 2, 2013
  1. Set default extension for new files to ‘.patch’

    Generally when saving a diff file it’s to submit it as a patch.
    sorbits committed Oct 2, 2013
Commits on Sep 4, 2013
Commits on Aug 5, 2013
  1. Prevent false positive grammar match with YAML files

    Require a character other than a newline to follow "--- " to prevent matching YAML files starting with an array or dictionary.
    infininight committed Aug 5, 2013
Commits on Mar 4, 2013
Commits on Feb 22, 2013
  1. Match git hashes longer than 7 characters

    This may happen if 7 characters is not enough to provide ambiguity.
    infininight committed Feb 22, 2013
  2. Update Syntaxes/Diff.plist to recognize .rej files

    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.
    slottermoser committed Feb 22, 2013
Commits on Feb 6, 2013
  1. Don’t use ‘tr’ to strip CR line endings

    We pass --strip-trailing-cr to the diff command so there is no need for manually stripping the CR characters.
    
    Closes #2.
    sorbits committed Feb 6, 2013
  2. Don’t force a text encoding for shell commands

    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.
    sorbits committed Feb 6, 2013
  3. Use TextMate’s display name for untitled documents

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

    infininight committed Nov 12, 2011
Commits on Oct 5, 2011
Commits on Oct 26, 2008
Commits on Apr 12, 2008
  1. Added code folding when there are multiple documents listed in the di…

    …ff. Makes it much easier to read.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@9370 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    subtleGradient committed Apr 12, 2008
Commits on Mar 18, 2008
  1. • update commands to show “There are no differences.” when there are …

    …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
    sorbits committed Mar 18, 2008
Commits on Feb 22, 2008
  1. Tighten up the firstLineMatch for the context diff format, was catchi…

    …ng various maude files.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@8977 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    infininight committed Feb 22, 2008
Commits on Nov 4, 2007
  1. • update my email address (from a throw-away address to something a l…

    …ittle more permanent)
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@8398 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Nov 4, 2007
Commits on Jun 19, 2007
  1. • rewrite first line match pattern to be extended (and thus split int…

    …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
    sorbits committed Jun 19, 2007
Commits on Jun 4, 2007
  1. • remove ‘< "$TM_FILEPATH"’ (so it uses the buffer, rather than the f…

    …ile on disk)
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@7437 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Jun 4, 2007
Commits on May 9, 2007
  1. Change in-menu name from Clibpoard to Clipboard.

    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@7183 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    infininight committed May 9, 2007
Commits on May 5, 2007
  1. • add ‘--strip-trailing-cr’ since the document (which we diff against…

    …) 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
    sorbits committed May 5, 2007
Commits on Apr 5, 2007
  1. • add double-quotes around $TM_SELECTED_FILES

    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6950 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Apr 5, 2007
  2. • use proper Title Case (as defined by Apple, i.e. uppercase ‘From’)

    • 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
    sorbits committed Apr 5, 2007
Commits on Mar 21, 2007
  1. Added 'Apply Patch from Clipboard' command to Diff bundle. (Apologies…

    … 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
    canadaduane committed Mar 21, 2007
Commits on Mar 4, 2007
  1. Add the following keys to the bundle’s info.plist:

    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
    sorbits committed Mar 4, 2007
Commits on Mar 2, 2007
  1. • provide diff with appropriate labels for the two input sources bein…

    …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
    sorbits committed Mar 2, 2007
Commits on Feb 13, 2007
  1. • give ‘-p0’ as option to patch. This makes it use the full path spec…

    …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
    sorbits committed Feb 13, 2007
Commits on Nov 10, 2006
  1. • exclude the +++/--- lines when calculating statistics (thanks to Gr…

    …ant Hollingworth)
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6058 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Nov 10, 2006