projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a81f1a8 37d29e1)
Merge branch 'ab/blame-textconv'
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Jun 2010 19:07:44 +0000 (12:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Jun 2010 19:07:44 +0000 (12:07 -0700)
commit4af574dbdc543b43e16838ed69890470b763136d
tree47cc6f4185420bf3ac405a4018cc25d7047af21dtree | snapshot
parenta81f1a825bebe1b4d202832b804957d1547d7f60commit | diff
parent37d29e1051ef8406d21f8b284a659080fcfe3f72commit | diff
Merge branch 'ab/blame-textconv'

* ab/blame-textconv:
  t/t8006: test textconv support for blame
  textconv: support for blame
  textconv: make the API public

Conflicts:
diff.h
builtin/blame.c diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
diff.h diff1 | diff2 | blob | history
Git—the stupid content tracker