diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:54:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:54:51 -0700 |
| commit | d907bf8ef327cd47433d4a4bb0a1bb4e96b6e340 (patch) | |
| tree | 2475a33111f13c32a4e8540fb9d273bee0c5c601 /Documentation/git-merge.txt | |
| parent | Merge branch 'jn/mime-type-with-params' (diff) | |
| parent | verify-pack: use index-pack --verify (diff) | |
| download | tgif-d907bf8ef327cd47433d4a4bb0a1bb4e96b6e340.tar.xz | |
Merge branch 'jc/index-pack'
* jc/index-pack:
verify-pack: use index-pack --verify
index-pack: show histogram when emulating "verify-pack -v"
index-pack: start learning to emulate "verify-pack -v"
index-pack: a miniscule refactor
index-pack --verify: read anomalous offsets from v2 idx file
write_idx_file: need_large_offset() helper function
index-pack: --verify
write_idx_file: introduce a struct to hold idx customization options
index-pack: group the delta-base array entries also by type
Conflicts:
builtin/verify-pack.c
cache.h
sha1_file.c
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions