Merge branch 'tr/xdiff-fast-hash' into pu

Will merge to 'next'.

By Thomas Rast
* tr/xdiff-fast-hash:
  xdiff: load full words in the inner loop of xdl_hash_record
Merge branch 'nl/http-proxy-more' into pu

The code to talk to http proxies learn to use the same credential
API used to talk to the final http destinations.  This still needs
to peek into $ENV{HTTPS_PROXY}.

By Nelson Benitez Leon (5) and others
* nl/http-proxy-more:
  http: fix proxy password passing
  http: fix proxy authentication
  http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
  http: Avoid limit of retrying request only twice
  http: handle proxy authentication failure (error 407)
  http: handle proxy proactive authentication
  http: try http_proxy env var when http.proxy config option is not set
Merge branch 'mm/push-default-switch-warning' into pu

Introduces 'simple' mode to be used as the push.default in a future
version of git.  I think the series is almost there modulo some minor
nits.

By Matthieu Moy (6) and others
* mm/push-default-switch-warning:
  fixup! push: introduce new push.default mode "simple"
  fixup! t5528-push-default.sh: add helper functions
  push: suggested updates to push configuration documentation
  push: start warning upcoming default change for push.default
  push: document the future default change for push.default (matching -> simple)
  t5570: use explicit push refspec
  push: introduce new push.default mode "simple"
  t5528-push-default.sh: add helper functions
  Undocument deprecated alias 'push.default=tracking'
  Documentation: explain push.default option a bit more
Merge branch 'jc/split-blob' into pu

Not ready.

I finished the streaming checkout codepath, but as explained in
127b177 (bulk-checkin: support chunked-object encoding, 2011-11-30),
these are still early steps of a long and painful journey. At least
pack-objects and fsck need to learn the new encoding for the series
to be usable locally, and then index-pack/unpack-objects needs to
learn it to be used remotely.

Given that I heard a lot of noise that people want large files, and
that I was asked by somebody at GitTogether'11 privately for an
advice on how to pay developers (not me) to help adding necessary
support, I am somewhat dissapointed that the original patch series
that was sent almost two months ago still remains here without much
comments and updates from the developer community. I even made the
interface to the logic that decides where to split chunks easily
replaceable, and I deliberately made the logic in the original patch
extremely stupid to entice others, especially the "bup" fanboys, to
come up with a better logic, thinking that giving people an easy
target to shoot for, they may be encouraged to help out. The plan is
not working :-(.

* jc/split-blob:
  chunked-object: streaming checkout
  chunked-object: fallback checkout codepaths
  bulk-checkin: support chunked-object encoding
  bulk-checkin: allow the same data to be multiply hashed
  new representation types in the packstream
  packfile: use varint functions

Conflicts:
	t/t1050-large.sh
Merge branch 'jc/run-hook-env-1' into pu

Not urgent.

Updates run_hook() API to be much less specific to "commit".  It would
only be useful if people start doing more interesting things with hooks.

* jc/run-hook-env-1:
  run_hook(): enhance the interface to pass arbitrary environment
Merge branch 'th/difftool-diffall' into pu

Rolls the two-directory-diff logic from diffall script (in contrib/) into
"git difftool" framework.

Still being reworked.

By Tim Henigan
* th/difftool-diffall:
  difftool: print list of valid tools with '--tool-help'
  difftool: teach difftool to handle directory diffs
  difftool: eliminate setup_environment function
  difftool: stop appending '.exe' to git
  difftool: remove explicit change of PATH
  difftool: exit(0) when usage is printed
  difftool: add '--no-gui' option
  difftool: parse options using Getopt::Long
Merge branch 'nd/threaded-index-pack' into pu

By Nguyễn Thái Ngọc Duy (3) and Ramsay Jones (1)
* nd/threaded-index-pack:
  index-pack: disable threading if NO_PREAD is defined
  index-pack: support multithreaded delta resolving
  index-pack: split second pass obj handling into own function
  compat/win32/pthread.h: Add an pthread_key_delete() implementation
Merge branch 'cb/daemon-test-race-fix' into pu

Fix race condition between starting and waiting for git-daemon in the
test.

Re-queued with a fix.

By Clemens Buchacher
* cb/daemon-test-race-fix:
  git-daemon wrapper to wait until daemon is ready
Merge branch 'nh/empty-rebase' into pu

By Neil Horman (4) and Junio C Hamano (3)
* nh/empty-rebase:
  fixup! git-rebase: add keep_empty flag
  git-rebase: add keep_empty flag
  fixup! git-cherry-pick: Add test to validate new options
  git-cherry-pick: Add test to validate new options
  fixup! git-cherry-pick: Add keep-redundant-commits option
  git-cherry-pick: Add keep-redundant-commits option
  git-cherry-pick: add allow-empty option
Merge branch 'pw/t5800-import-race-fix' into pu

By Junio C Hamano (1) and Pete Wyckoff (1)
* pw/t5800-import-race-fix:
  fixup! git-remote-testgit: fix race when spawning fast-import
  git-remote-testgit: fix race when spawning fast-import
Merge branch 'rk/git-svn-ignore-sigpipe' into pu

By Roman Kagan
* rk/git-svn-ignore-sigpipe:
  git-svn: drop redundant blocking of SIGPIPE
  git-svn: ignore SIGPIPE
  git-svn: use POSIX::sigprocmask to block signals
Merge branch 'nd/i18n' into pu

By Nguyễn Thái Ngọc Duy (9) and others
* nd/i18n:
  i18n: bundle: mark strings for translation
  i18n: index-pack: mark strings for translation
  i18n: apply: update say_patch_name to give translators complete sentence
  i18n: apply: mark strings for translation
  i18n: remote: mark strings for translation
  i18n: make warn_dangling_symref() automatically append \n
  i18n: help: mark strings for translation
  i18n: mark relative dates for translation
  fixup! strbuf: convenience format functions with \n automatically appended
  strbuf: convenience format functions with \n automatically appended
  Makefile: feed all header files to xgettext

Conflicts:
	builtin/apply.c
	builtin/help.c
	builtin/index-pack.c
	refs.c