]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ak/cat-file-clean-up'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2015 21:46:38 +0000 (13:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2015 21:46:38 +0000 (13:46 -0800)
* ak/cat-file-clean-up:
  cat-file: use "type" and "size" from outer scope

1  2 
builtin/cat-file.c

Simple merge