delta/git.git, branch nl/http-proxy-auth

http: support proxies that require authentication

2012-03-02T22:40:14+00:00

When the proxy server specified by the http.proxy configuration or the
http_proxy environment variable requires authentication, git failed to
connect to the proxy, because we did not configure the cURL handle with
CURLOPT_PROXYAUTH.

When a proxy is in use, and you tell git that the proxy requires
authentication by having username in the http.proxy configuration, an
extra request needs to be made to the proxy to find out what
authentication method it supports, as this patch uses CURLAUTH_ANY to let
the library pick the most secure method supported by the proxy server.

The extra round-trip adds extra latency, but relieves the user from the
burden to configure a specific authentication method.  If it becomes
problem, a later patch could add a configuration option to specify what
method to use, but let's start simple for the time being.

Signed-off-by: Nelson Benitez Leon 
Signed-off-by: Junio C Hamano

Update draft release notes to 1.7.10

2012-03-02T19:49:41+00:00

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2012-03-02T19:49:06+00:00

* maint:
  Documentation: do not assume that n > 1 in ~$n

Documentation: do not assume that n > 1 in ~$n

2012-03-02T17:33:29+00:00

We explained ~ as th generation grand-parent, but a reader got
confused by the "grand-" part when  is 1.

Reword it with "ancestor"; with the "generation" and "following only the
first parents" around there, what we try to describe should be clear
enough now.

Noticed-by: Luke Diamand 
Helped-by: Thomas Rast 
Helped-by: Andreas Ericsson 
Signed-off-by: Junio C Hamano

Merge branch 'cb/fsck-squelch-dangling'

2012-03-02T04:59:41+00:00

* cb/fsck-squelch-dangling:
  fsck: --no-dangling omits "dangling object" information

Merge branch 'rs/no-no-no-parseopt'

2012-03-02T04:59:31+00:00

* rs/no-no-no-parseopt:
  parse-options: remove PARSE_OPT_NEGHELP
  parse-options: allow positivation of options starting, with no-
  test-parse-options: convert to OPT_BOOL()

Conflicts:
	builtin/grep.c

Merge branch 'th/git-diffall'

2012-03-02T04:59:25+00:00

* th/git-diffall:
  contrib: add git-diffall script

Merge the initial l10n effort in

2012-03-02T04:52:03+00:00

* l10n:
  Update l10n guide: change the repository URL, etc
  l10n: leave leading space unchanged for zh_CN.po
  Update l10n guide
  l10n: update Chinese translation to the new git.po
  l10n: Update git.pot (12 new messages)
  l10n: fast-forward here is ff-only merge, not push
  l10n: update zh_CN translation for "Fetching %s"
  l10n: po for zh_CN
  l10n: initial git.pot for 1.7.10 upcoming release

Merge branch 'master' of https://github.com/git-l10n/git-po into l10n

2012-03-02T04:51:37+00:00

* 'master' of https://github.com/git-l10n/git-po:
  l10n: leave leading space unchanged for zh_CN.po

Update l10n guide: change the repository URL, etc

2012-03-02T04:50:49+00:00

Host the l10n coordinator repository in a dedicated github organization
account "git-l10n", so that the team may have a more permanent home.
Also add a hint about reference of TEAMS file for l10n contributors.

Update TEAMS file with new zh_CN l10n team members and a repository URL.

Signed-off-by: Jiang Xin 
Signed-off-by: Junio C Hamano