• J
    diff: add filter for converting binary to text · 9cb92c39
    Jeff King 提交于
    When diffing binary files, it is sometimes nice to see the
    differences of a canonical text form rather than either a
    binary patch or simply "binary files differ."
    
    Until now, the only option for doing this was to define an
    external diff command to perform the diff. This was a lot of
    work, since the external command needed to take care of
    doing the diff itself (including mode changes), and lost the
    benefit of git's colorization and other options.
    
    This patch adds a text conversion option, which converts a
    file to its canonical format before performing the diff.
    This is less flexible than an arbitrary external diff, but
    is much less work to set up. For example:
    
      $ echo '*.jpg diff=exif' >>.gitattributes
      $ git config diff.exif.textconv exiftool
      $ git config diff.exif.binary false
    
    allows one to see jpg diffs represented by the text output
    of exiftool.
    Signed-off-by: NJeff King <peff@peff.net>
    Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
    9cb92c39
userdiff.h 519 字节