projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0707a9d 2c3fa66)
Merge branch 'jc/diff-mark'
authorJunio C Hamano <gitster@pobox.com>
Sat, 7 Jul 2007 20:37:32 +0000 (13:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 7 Jul 2007 20:37:32 +0000 (13:37 -0700)
commite3c76dbd0f7531eaed3ca8ec0000f03499839304
treeabfeb18cc08e1465390443e12ae7c3d8c7b1cd5btree | snapshot
parent0707a9d6f200bbafc02d13dd7f2c12bb795999f6commit | diff
parent2c3fa66f3577d1305fb0fac5a181261fb2597859commit | diff
Merge branch 'jc/diff-mark'

* jc/diff-mark:
  diff: honor binariness specified in attributes
  Fix configuration syntax to specify customized hunk header patterns.
  Per-path attribute based hunk header selection.
  Future-proof source for changes in xdemitconf_t
  Introduce diff_filespec_is_binary()
builtin-rerere.c diff1 | diff2 | blob | history
Git—the stupid content tracker