projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4bb4d30 a3a6f4c)
Merge branch 'jn/fast-import-blob-access'
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 20:58:38 +0000 (12:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 20:58:38 +0000 (12:58 -0800)
commit914584266c7675d3d0fa18e0eed05742327b22e5
treeab6a44bcb8fd8263e0fdbebfd4b722de4a070d91tree | snapshot
parent4bb4d30095fbc3b1689cc656e71f6a51e43fbd69commit | diff
parenta3a6f4c4cdc42a4d432bc51915d3e1d092d8ca9acommit | diff
Merge branch 'jn/fast-import-blob-access'

* jn/fast-import-blob-access:
  t9300: avoid short reads from dd
  t9300: remove unnecessary use of /dev/stdin
  fast-import: Allow cat-blob requests at arbitrary points in stream
  fast-import: let importers retrieve blobs
  fast-import: clarify documentation of "feature" command
  fast-import: stricter parsing of integer options

Conflicts:
fast-import.c
Documentation/git-fast-import.txt diff1 | diff2 | blob | history
fast-import.c diff1 | diff2 | blob | history
t/t9300-fast-import.sh diff1 | diff2 | blob | history
Git—the stupid content tracker