projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5dc6411 0508fe5)
Merge branch 'jk/combine-diff-binary-etc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:10 +0000 (17:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:10 +0000 (17:03 -0700)
commitdbae1a13363c45d3f77061f61ca73a0c3ed045cf
treee20c7222570b55dbcb4ce4cf9bb91ae8149f52batree | snapshot
parent5dc6411edc6ed5d822b65b9f5cf61ab6fe6d3fa8commit | diff
parent0508fe533dfe1b890f6a2d31ca42ba25466e8ff5commit | diff
Merge branch 'jk/combine-diff-binary-etc'

* jk/combine-diff-binary-etc:
  combine-diff: respect textconv attributes
  refactor get_textconv to not require diff_filespec
  combine-diff: handle binary files as binary
  combine-diff: calculate mode_differs earlier
  combine-diff: split header printing into its own function
diff.c diff1 | diff2 | blob | history
userdiff.c diff1 | diff2 | blob | history
Git—the stupid content tracker