Merge branch 'dg/test-from-elsewhere' into pu

By David A. Greene
* dg/test-from-elsewhere:
  Support out-of-tree Valgrind tests
  Allow overriding GIT_BUILD_DIR
Merge branch 'nl/http-proxy-more' into pu

By Nelson Benitez Leon
* nl/http-proxy-more:
  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 'jc/advise-push-default' into pu

By Junio C Hamano
* jc/advise-push-default:
  push: hint to use push.default=upstream when appropriate
Merge branch 'ss/git-svn-prompt-sans-terminal' into pu

By Sven Strickroth (2) and Junio C Hamano (1)
* ss/git-svn-prompt-sans-terminal:
  fixup! 15eaaf4
  git-svn, perl/Git.pm: extend Git::prompt helper for querying users
  perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS
Merge branch 'hv/submodule-recurse-push' into pu

By Heiko Voigt
* hv/submodule-recurse-push:
  : The bottom one was not clearly explained.
  push: teach --recurse-submodules the on-demand option
  Refactor submodule push check to use string list instead of integer
  Teach revision walking machinery to walk multiple times sequencially

Conflicts:
	transport.h
Merge branch 'nd/columns' into pu

By Nguyễn Thái Ngọc Duy
* nd/columns:
  tag: add --column
  column: support piping stdout to external git-column process
  status: add --column
  branch: add --column
  help: reuse print_columns() for help -a
  column: add column.ui for default column output settings
  column: add dense layout support
  column: add columnar layout
  Stop starting pager recursively
  Add git-column for columnar display
Merge branch 'nd/optim-connected' into pu

By Nguyễn Thái Ngọc Duy
* nd/optim-connected:
  Perform cheaper connectivity check when pack is used as medium
Merge branch 'jc/split-blob' into pu

By Junio C Hamano
* jc/split-blob:
  fixup?
  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
  varint-in-pack: refactor varint encoding/decoding

Conflicts:
	t/t1050-large.sh
Merge branch 'jh/trace-use-startup-info' into pu

By Jared Hance
* jh/trace-use-startup-info:
  Use startup_info->prefix rather than prefix.
Merge branch 'jh/apply-free-patch' into pu

By Jared Hance
* jh/apply-free-patch:
  apply: do not leak patches and fragments
Merge branch 'ph/rerere-doc' into pu

By Phil Hord
* ph/rerere-doc:
  rerere: Document 'rerere remaining'
Merge branch 'jc/maint-undefined-i18n-observation-test' into pu

By Junio C Hamano
* jc/maint-undefined-i18n-observation-test:
  t0204: clarify the "observe undefined behaviour" test
Merge branch 'sl/customize-sane-tool-path' into pu

By Stefano Lattarini
* sl/customize-sane-tool-path:
  configure: allow user to prevent $PATH "sanitization" on Solaris
Merge branch 'mm/push-default-switch-warning' into pu

By Matthieu Moy
* mm/push-default-switch-warning:
  push: start warning upcoming default change for push.default

Conflicts:
	builtin/push.c
Merge branch 'ab/perl-i18n' into pu

By Ævar Arnfjörð Bjarmason (2) and Junio C Hamano (1)
* ab/perl-i18n:
  fixup! de1e4ae
  perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
  Git::I18N: compatibility with perl <5.8.3
Merge branch 'jn/maint-fast-import-empty-ls' into pu

By Jonathan Nieder
via Jonathan Nieder
* jn/maint-fast-import-empty-ls:
  fast-import: don't allow 'ls' of path with empty components
  fast-import: leakfix for 'ls' of dirty trees
Merge branch 'jc/commit-hook-authorship' into pu

By Junio C Hamano
* jc/commit-hook-authorship:
  commit: pass author/committer info to hooks
  t7503: does pre-commit-hook learn authorship?
  ident.c: add split_ident_line() to parse formatted ident line
Merge branch 'jc/run-hook-env-1' (early part) into pu

By Junio C Hamano
* 'jc/run-hook-env-1' (early part):
  run_hook(): enhance the interface to pass arbitrary environment
Merge branch 'ms/maint-config-error-at-eol-linecount' into pu

By Martin Stenberg
* ms/maint-config-error-at-eol-linecount:
  config: report errors at the EOL with correct line number
Merge branch 'jc/diff-algo-cleanup' into pu

By Junio C Hamano
* jc/diff-algo-cleanup:
  xdiff: PATIENCE/HISTOGRAM are not independent option bits
  xdiff: remove XDL_PATCH_* macros