Junio C Hamano d907bf8ef3 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

2011-07-19 09:54:51 -07:00

..

add.c

Merge branch 'ci/commit--interactive-atomic'

2011-05-16 16:47:10 -07:00

annotate.c

…

apply.c

zlib: zlib can only process 4GB at a time

2011-06-10 11:52:15 -07:00

archive.c

upload-archive: allow user to turn off filters

2011-06-22 11:12:35 -07:00

bisect--helper.c

…

blame.c

blame: add --line-porcelain output format

2011-05-09 15:27:50 -07:00

branch.c

Merge branch 'maint-1.7.5' into maint

2011-06-29 16:41:55 -07:00

bundle.c

…

cat-file.c

plug a few coverity-spotted leaks

2011-06-20 14:27:36 -07:00

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'jc/maint-1.7.3-checkout-describe'

2011-06-29 17:03:12 -07:00

clean.c

…

clone.c

clone: accept config options on the command line

2011-06-22 11:25:21 -07:00

commit-tree.c

…

commit.c

Merge branch 'bc/maint-status-z-to-use-porcelain'

2011-06-06 11:40:08 -07:00

config.c

config: Give error message when not changing a multivar

2011-05-17 21:01:29 -07:00

count-objects.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

plug a few coverity-spotted leaks

2011-06-20 14:27:36 -07:00

fast-export.c

…

fetch-pack.c

Merge branch 'jk/haves-from-alternate-odb'

2011-05-29 23:51:22 -07:00

fetch.c

fetch: do not leak a refspec

2011-06-08 17:21:08 -07:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

builtin/gc.c: add missing newline in message

2011-06-19 14:46:39 -07:00

grep.c

grep: add --heading

2011-06-05 18:15:27 -07:00

hash-object.c

index_fd(): turn write_object and format_check arguments into one flag

2011-05-09 11:58:19 -07:00

help.c

…

index-pack.c

Merge branch 'jc/index-pack'

2011-07-19 09:54:51 -07:00

init-db.c

Merge branch 'ab/i18n-fixup' into maint

2011-05-31 12:00:27 -07:00

log.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

ls-files.c

…

ls-remote.c

ls-remote: the --exit-code option reports "no matching refs"

2011-05-18 14:37:46 -07:00

ls-tree.c

…

mailinfo.c

mailinfo: always clean up rfc822 header folding

2011-05-26 14:13:38 -07:00

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

mktag.c

read_sha1_file(): get rid of read_sha1_file_repl() madness

2011-05-15 15:23:33 -07:00

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

notes remove: --stdin reads from the standard input

2011-05-19 10:54:16 -07:00

pack-objects.c

Merge branch 'jc/index-pack'

2011-07-19 09:54:51 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

…

read-tree.c

Teach read-tree the -n|--dry-run option

2011-05-25 15:04:25 -07:00

receive-pack.c

receive-pack: eliminate duplicate .have refs

2011-05-19 20:02:31 -07:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'jk/clone-cmdline-config'

2011-07-19 09:45:24 -07:00

replace.c

…

rerere.c

rerere: libify rerere_clear() and rerere_gc()

2011-05-08 12:55:34 -07:00

reset.c

…

rev-list.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

rev-parse.c

show: --ignore-missing

2011-05-19 10:55:54 -07:00

revert.c

revert: allow reverting a root commit

2011-05-16 13:01:45 -07:00

rm.c

…

send-pack.c

Merge branch 'jk/git-connection-deadlock-fix' into maint

2011-05-26 09:33:25 -07:00

shortlog.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

show-branch.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

Merge branch 'jk/tag-list-multiple-patterns'

2011-07-19 09:45:15 -07:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

zlib: zlib can only process 4GB at a time

2011-06-10 11:52:15 -07:00

update-index.c

plug a few coverity-spotted leaks

2011-06-20 14:27:36 -07:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

upload-archive: allow user to turn off filters

2011-06-22 11:12:35 -07:00

var.c

…

verify-pack.c

verify-pack: use index-pack --verify

2011-06-05 22:45:38 -07:00

verify-tag.c

…

write-tree.c

…