diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-16 22:33:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-16 22:33:40 -0800 |
| commit | 48b303675aa238c209e527feadcbb7ba1c025c97 (patch) | |
| tree | 6a48f4388867f836db0e4c015098348079a9185d /combine-diff.c | |
| parent | Merge branch 'aw/rebase-i-stop-on-failure-to-amend' (diff) | |
| parent | bulk-checkin: replace fast-import based implementation (diff) | |
| download | git-48b303675aa238c209e527feadcbb7ba1c025c97.tar.gz git-48b303675aa238c209e527feadcbb7ba1c025c97.zip | |
Merge branch 'jc/stream-to-pack'
* jc/stream-to-pack:
bulk-checkin: replace fast-import based implementation
csum-file: introduce sha1file_checkpoint
finish_tmp_packfile(): a helper function
create_tmp_packfile(): a helper function
write_pack_header(): a helper function
Conflicts:
pack.h
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions