git, branch v1.7.11-rc2

Git 1.7.11-rc2

2012-06-07T16:14:41Z

Signed-off-by: Junio C Hamano

Merge branch 'mm/api-credentials-doc'

2012-06-07T16:07:35Z

* mm/api-credentials-doc: api-credentials.txt: add "see also" section api-credentials.txt: mention credential.helper explicitly api-credentials.txt: show the big picture first doc: fix xref link from api docs to manual pages

Merge branch 'rr/maint-t3510-cascade-fix'

2012-06-07T16:07:27Z

* rr/maint-t3510-cascade-fix: t3510 (cherry-pick-sequence): add missing '&&'

Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'

2012-06-07T16:07:08Z

Regression fix for people with libsvn between 1.6.12 and 1.6.15, on which we tried to use the non-working platform auth providers. * jc/svn-auth-providers-unusable-at-1.6.12: git-svn: platform auth providers are working only on 1.6.15 or newer

Merge branch 'cr/persistent-https'

2012-06-07T16:06:39Z

A remote helper that acts as a proxy and caches ssl session for the https:// transport is added to the contrib/ area. By Colby Ranger * cr/persistent-https: Add persistent-https to contrib

Merge git://github.com/git-l10n/git-po

2012-06-05T17:57:53Z

German and Chinese translation updates. By Ralf Thielow (4) and others via Jiang Xin (1) and Tran Ngoc Quan (1) * git://github.com/git-l10n/git-po: l10n: Update translation for Vietnamese l10n: de.po: add additional newline l10n: de.po: translate 2 new, 3 fuzzy messages l10n: de.po: translate 41 new messages l10n: de.po: translate 265 new messages l10n: zh_CN.po: translate 2 new, 3 fuzzy messages l10n: Update git.pot (5 new, 3 removed messages)

t3510 (cherry-pick-sequence): add missing '&&'

2012-06-04T22:35:22Z

Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Fix an instance of this in the setup. Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano

api-credentials.txt: add "see also" section

2012-06-04T20:49:50Z

Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

api-credentials.txt: mention credential.helper explicitly

2012-06-04T20:49:44Z

The name of the configuration variable was mentioned only at the very end of the explanation, in a place specific to a specific rule, hence it was not very clear what the specification was about. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

api-credentials.txt: show the big picture first

2012-06-04T20:47:32Z

The API documentation targets two kinds of developers: those using the C API, and those writing remote-helpers. The document was not clear about which part was useful to which category, and for example, the C API could be mistakenly thought as an API for writting remote helpers. Based-on-patch-by: Jeff King Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano