projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ca6c06b 9cb92c3)
Merge branch 'jk/diff-convfilter'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:58:25 +0000 (17:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:58:25 +0000 (17:58 -0700)
commit2f91bcfa9d8d1f443012e3e92092f464f3bb3557
tree1813dc04efc420f0ece0b29481628d22831dd258tree | snapshot
parentca6c06b2efe2f55c498670efcb419bce35678e03commit | diff
parent9cb92c390cefd3bf3f71bbda12eb04893c861361commit | diff
Merge branch 'jk/diff-convfilter'

* jk/diff-convfilter:
  diff: add filter for converting binary to text
  diff: introduce diff.<driver>.binary
  diff: unify external diff and funcname parsing code
  t4012: use test_cmp instead of cmp
Git—the stupid content tracker