Sync with 2.4.2

Junio C Hamano committed over 11 years ago

Git 2.4.2

Junio C Hamano committed over 11 years ago

Merge branch 'jk/still-interesting' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jc/hash-object' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jk/rebase-quiet-noop' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'sg/complete-decorate-full-not-long' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jk/stash-require-clean-index' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jk/git-no-more-argv0-path-munging' into maint

Junio C Hamano committed over 11 years ago

Fifth batch for 2.5 cycle

Junio C Hamano committed over 11 years ago

Merge branch 'nd/untracked-cache'

Junio C Hamano committed over 11 years ago

Merge branch 'rs/plug-leak-in-pack-bitmaps'

Junio C Hamano committed over 11 years ago

Merge branch 'pt/pull-ff-vs-merge-ff'

Junio C Hamano committed over 11 years ago

Merge branch 'pt/pull-log-n'

Junio C Hamano committed over 11 years ago

Merge branch 'jk/rerere-forget-check-enabled'

Junio C Hamano committed over 11 years ago

git-p4: tests: use test-chmtime in place of touch

Luke Diamand committed over 11 years ago

t4015: separate common setup and per-test expectation

Junio C Hamano committed over 11 years ago

t4015: modernise style

Junio C Hamano committed over 11 years ago

Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlock

Junio C Hamano committed over 11 years ago