]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23983a4 1ee886c)
Merge branch 'jk/unpack-entry-fallback-to-another'
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:20 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:20 +0000 (14:53 -0700)
* jk/unpack-entry-fallback-to-another:
  unpack_entry: do not die when we fail to apply a delta
  t5303: drop "count=1" from corruption dd

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

diff --cc sha1_file.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.