Merge branch 'cp/textconv-cat-file'
commitcf4403a01070f03e5c5cc65b52c1351d20ff4e91
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Jun 2010 19:07:55 +0000 (27 12:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Jun 2010 19:07:55 +0000 (27 12:07 -0700)
treef96c26b4d03521fbed7774703672ccffc4b4876d
parent6aa206413ad7755577cfe29b8ffd16082c211a07
parent9f77fe022425360dced8b1f19275852e89d2351c
Merge branch 'cp/textconv-cat-file'

* cp/textconv-cat-file:
  git-cat-file.txt: Document --textconv
  t/t8007: test textconv support for cat-file
  textconv: support for cat_file
  sha1_name: add get_sha1_with_context()
builtin.h
builtin/blame.c
builtin/cat-file.c
cache.h
sha1_name.c