Merge branch 'jk/test-annoyances' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'pt/enter-repo-comment-fix' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jz/gitweb-conf-doc-fix' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jk/cherry-pick-docfix' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'iu/fix-parse-options-h-comment' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jg/cguide-we-cannot-count' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jk/pack-corruption-post-mortem' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint

Junio C Hamano committed over 11 years ago

RelNotes: "merge --quiet" change has been reverted

Junio C Hamano committed over 11 years ago

Hopefully the last batch for 2.4

Junio C Hamano committed over 11 years ago

Merge branch 'ps/grep-help-all-callback-arg'

Junio C Hamano committed over 11 years ago

Merge branch 'tb/connect-ipv6-parse-fix'

Junio C Hamano committed over 11 years ago

Merge branch 'va/fix-git-p4-tests'

Junio C Hamano committed over 11 years ago

Merge branch 'jc/push-cert'

Junio C Hamano committed over 11 years ago

Merge branch 'ma/bash-completion-leaking-x'

Junio C Hamano committed over 11 years ago

fmt-merge-msg: plug small leak of commit buffer

Junio C Hamano committed over 11 years ago

sha1_file: only freshen packs once per run

Jeff King committed over 11 years ago

sha1_file: freshen pack objects before loose

Jeff King committed over 11 years ago

reachable: only mark local objects as recent

Jeff King committed over 11 years ago

git-p4: use -m when running p4 changes

Lex Spoon committed over 11 years ago