projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7406aa2 55e7c0a)
Merge branch 'ss/blame-textconv-fake-working-tree'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 22:20:28 +0000 (15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 22:20:28 +0000 (15:20 -0700)
commitb919f8404a9e212b3b9d602d4060e440072a0303
treec8a2b04cb95fef931d7b75a5e6bdc0db32ac4d79tree | snapshot
parent7406aa203ff0571815fc472486ae7271049185e6commit | diff
parent55e7c0aaa1b2c00d147b1b4b1aa88a71d90dacf4commit | diff
Merge branch 'ss/blame-textconv-fake-working-tree'

* ss/blame-textconv-fake-working-tree:
  (squash) test for previous
  blame.c: Properly initialize strbuf after calling, textconv_object()

Conflicts:
t/t8006-blame-textconv.sh
builtin/blame.c diff1 | diff2 | blob | history
t/t8006-blame-textconv.sh diff1 | diff2 | blob | history
Git—the stupid content tracker