git, branch v1.7.10-rc2

Git 1.7.10-rc2

2012-03-23T22:11:24Z

Signed-off-by: Junio C Hamano

.mailmap: unify various old mail addresses of gitster

2012-03-23T21:40:39Z

"git shortlog -s -e" should show a single current address with this. Signed-off-by: Junio C Hamano

Merge branch 'am/completion-zsh-fix'

2012-03-23T21:36:21Z

* am/completion-zsh-fix: contrib/completion: "local var=()" is misinterpreted as func-decl by zsh

Merge branch 'dw/gitweb-doc-grammo'

2012-03-23T21:36:13Z

Typofix. * dw/gitweb-doc-grammo: Documentation/gitweb: trivial English fixes

Documentation/gitweb: trivial English fixes

2012-03-23T18:22:04Z

Change "it's" to "its" where a possessive is intended. Also add two missing "the" that were noticed by Ben Walton. Signed-off-by: David Waitzman

contrib/completion: "local var=()" is misinterpreted as func-decl by zsh

2012-03-21T17:02:39Z

Certain versions of zsh seems to treat local var=() as a function declaration, rather than an assignment of an empty array, although its documentation does not suggest that this should be the case. With zsh 4.3.15 on Fedora Core 15, this causes __git_ps1 " (%s)" to trigger an error message: local:2: command not found: svn_url_pattern when GIT_PS1_SHOWUPSTREAM="auto". Signed-off-by: Alex Merry Signed-off-by: Junio C Hamano

Merge branch 'maint'

2012-03-20T22:54:28Z

* maint:

Merge branch 'maint-1.7.8' into maint

2012-03-20T22:53:30Z

* maint-1.7.8: t/Makefile: Use $(sort ...) explicitly where needed gitweb: Fix actionless dispatch for non-existent objects i18n of multi-line advice messages

Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8

2012-03-20T22:26:19Z

* ks/sort-wildcard-in-makefile: t/Makefile: Use $(sort ...) explicitly where needed

Merge branch 'jc/advise-i18n' into maint-1.7.8

2012-03-20T22:25:38Z

* jc/advise-i18n: i18n of multi-line advice messages