author | Junio C Hamano <gitster@pobox.com> | |
Mon, 1 Feb 2010 20:41:31 +0000 (12:41 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 1 Feb 2010 20:42:00 +0000 (12:42 -0800) | ||
commit | 844ad3d9a0418b4a3a6a944a50d65403121a0eb6 | |
tree | 2b74a0fb6cd6d5144814410cbc1642365249bc0a | tree | snapshot |
parent | b2c2e4c22c6a4fe151f02380d247cf3d9a9d5d1e | commit | diff |
parent | 5eef828bc03649ba11acc05c983d72823c27f0bb | commit | diff |
Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blob
* sp/maint-fast-import-large-blob:
fast-import: Stream very large blobs directly to pack
bash: don't offer remote transport helpers as subcommands
Conflicts:
fast-import.c
* sp/maint-fast-import-large-blob:
fast-import: Stream very large blobs directly to pack
bash: don't offer remote transport helpers as subcommands
Conflicts:
fast-import.c