projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f246b1 9ec09b0)
Merge branch 'ks/blame-worktree-textconv-cached'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2010 22:30:52 +0000 (14:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2010 22:30:52 +0000 (14:30 -0800)
* ks/blame-worktree-textconv-cached:
  fill_textconv(): Don't get/put cache if sha1 is not valid
  t/t8006: Demonstrate blame is broken when cachetextconv is on

1  2 
diff.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
Git—the stupid content tracker