git, branch v2.5.0-rc1

Git 2.5.0-rc1

2015-07-01T21:05:33Z

Signed-off-by: Junio C Hamano

Merge branch 'me/fetch-into-shallow-safety'

2015-07-01T21:02:33Z

"git fetch --depth=" and "git clone --depth=" issued a shallow transfer request even to an upload-pack that does not support the capability. * me/fetch-into-shallow-safety: fetch-pack: check for shallow if depth given

Merge branch 'jc/prompt-document-ps1-state-separator'

2015-07-01T21:02:32Z

Docfix. * jc/prompt-document-ps1-state-separator: git-prompt.sh: document GIT_PS1_STATESEPARATOR

Merge branch 'mm/describe-doc'

2015-07-01T21:02:31Z

Docfix. * mm/describe-doc: Documentation/describe: improve one-line summary

Merge branch 'da/mergetool-winmerge'

2015-07-01T21:02:30Z

Hotfix for an earlier change already in 'master' that broke the default tool selection for mergetool. * da/mergetool-winmerge: mergetool-lib: fix default tool selection

Sync with maint

2015-06-28T21:51:12Z

* maint:

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

2015-06-26T06:03:27Z

A hotfix for the topic already in 'master'. * jk/stash-require-clean-index: Revert "stash: require a clean index to apply"

Merge branch 'cb/array-size' into maint

2015-06-26T06:03:25Z

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

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.