git, branch v2.5.0-rc0

Git 2.5.0-rc0

2015-06-25T18:08:39Z

Signed-off-by: Junio C Hamano

Merge branch 'cn/cvsimport-perl-update'

2015-06-25T18:08:08Z

* cn/cvsimport-perl-update: cvsimport: silence regex warning appearing in Perl 5.22.

Merge branch 'cb/array-size'

2015-06-25T18:07:42Z

* cb/array-size: Fix definition of ARRAY_SIZE for non-gcc builds

Sync with 2.4.5

2015-06-25T18:04:30Z

Git 2.4.5

2015-06-25T18:03:05Z

Signed-off-by: Junio C Hamano

Merge branch 'sg/merge-summary-config' into maint

2015-06-25T18:02:17Z

Doc updates. * sg/merge-summary-config: Documentation: include 'merge.branchdesc' for merge and config as well

Merge branch 'jk/make-fix-dependencies' into maint

2015-06-25T18:02:16Z

Build clean-up. * jk/make-fix-dependencies: Makefile: silence perl/PM.stamp recipe Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS Makefile: drop dependency between git-instaweb and gitweb

Merge branch 'sb/pack-protocol-mention-smart-http' into maint

2015-06-25T18:02:14Z

Doc updates. * sb/pack-protocol-mention-smart-http: Documentation/technical/pack-protocol: mention http as possible protocol

Merge branch 'jk/die-on-bogus-worktree-late' into maint

2015-06-25T18:02:13Z

The setup code used to die when core.bare and core.worktree are set inconsistently, even for commands that do not need working tree. * jk/die-on-bogus-worktree-late: setup_git_directory: delay core.bare/core.worktree errors

Merge branch 'pt/pull-tags-error-diag' into maint

2015-06-25T18:02:12Z

There was a dead code that used to handle "git pull --tags" and show special-cased error message, which was made irrelevant when the semantics of the option changed back in Git 1.9 days. * pt/pull-tags-error-diag: pull: remove --tags error in no merge candidates case