]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 670b81a ee02ac6)
Merge branch 'zh/cat-file-batch-fix' into zh/ref-filter-raw-data
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Jul 2021 19:16:34 +0000 (12:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Jul 2021 19:16:43 +0000 (12:16 -0700)
* zh/cat-file-batch-fix:
  cat-file: merge two block into one
  cat-file: handle trivial --batch format with --batch-all-objects

1  2 
t/t1006-cat-file.sh patch | diff1 | diff2 | blob | history

diff --cc t/t1006-cat-file.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.