* sd/init-template:
  wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
  t/t0001-init.sh: add test for 'init with init.templatedir set'
  init: having keywords without value is not a global error.
  Add a "TEMPLATE DIRECTORY" section to git-init[1].
  Add `init.templatedir` configuration variable.

* sh/am-keep-cr:
  git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
  git-am: Add am.keepcr and --no-keep-cr to override it
  git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
  documentation: 'git-mailsplit --keep-cr' is not hidden anymore

* cp/add-u-pathspec:
  test for add with non-existent pathspec
  git add -u: die on unmatched pathspec

When we added bunch of git-remote-* helper backends, we should have
done this to squelch complaints that they do not have their own
manual pages.  Also the entry for git-remote-helpers was not
properly marked as a non-command.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* lt/deepen-builtin-source:
  Move 'builtin-*' into a 'builtin/' subdirectory

Conflicts:
	Makefile

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:
  Merge accumulated fixes to prepare for 1.7.0.3

Conflicts:
	RelNotes

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* mw/maint-gcc-warns-unused-write:
  run-command.c: fix build warnings on Ubuntu

* fn/maint-mkdtemp-compat:
  Fix gitmkdtemp: correct test for mktemp() return value

* gb/maint-submodule-env:
  is_submodule_modified(): clear environment properly
  submodules: ensure clean environment when operating in a submodule
  shell setup: clear_local_git_env() function
  rev-parse: --local-env-vars option
  Refactor list of of repo-local env vars

* as/maint-expire:
  reflog: honor gc.reflogexpire=never
  prune: honor --expire=never

* ml/maint-grep-doc:
  grep docs: document --no-index option
  grep docs: --cached and <tree>... are incompatible
  grep docs: use AsciiDoc literals consistently
  grep docs: pluralize "Example" section

* jk/maint-push-tracking-wo-remote:
  push: fix segfault for odd config

* jc/fetch-param:
  fetch --all/--multiple: keep all the fetched branch information
  builtin-fetch --all/--multi: propagate options correctly
  t5521: fix and modernize

* ne/pack-local-doc:
  pack-objects documentation: Fix --honor-pack-keep as well.
  pack-objects documentation: reword "objects that appear in the standard input"
  Documentation: pack-objects: Clarify --local's semantics.

* jk/maint-add--interactive-delete:
  add-interactive: fix bogus diff header line ordering

* mm/mkstemps-mode-for-packfiles:
  Use git_mkstemp_mode instead of plain mkstemp to create object files
  git_mkstemps_mode: don't set errno to EINVAL on exit.
  Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
  git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
  Move gitmkstemps to path.c
  Add a testcase for ACL with restrictive umask.

* jc/maint-fix-mailinfo-strip:
  mailinfo: do not strip leading spaces even for a header line

* jc/grep-author-all-match-implicit:
  "log --author=me --grep=it" should find intersection, not union

* jc/checkout-detached:
  Reword "detached HEAD" notification

* maint-1.6.6:

* jc/maint-fix-test-perm:
  lib-patch-mode.sh: Fix permission
  t6000lib: Fix permission

* sp/maint-push-sideband:
  receive-pack: Send internal errors over side-band #2
  t5401: Use a bare repository for the remote peer
  receive-pack: Send hook output over side band #2
  receive-pack: Wrap status reports inside side-band-64k
  receive-pack: Refactor how capabilities are shown to the client
  send-pack: demultiplex a sideband stream with status data
  run-command: support custom fd-set in async
  run-command: Allow stderr to be a caller supplied pipe

* hm/maint-imap-send-crlf:
  git-imap-send: Convert LF to CRLF before storing patch to draft box

* gf/maint-sh-setup-nongit-ok:
  require_work_tree broken with NONGIT_OK

* jk/maint-rmdir-fix:
  rm: fix bug in recursive subdirectory removal

* rs/optim-text-wrap:
  utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
  utf8.c: remove strbuf_write()
  utf8.c: remove print_spaces()
  utf8.c: remove print_wrapped_text()

* tr/maint-cherry-pick-list:
  cherry_pick_list: quit early if one side is empty

* cc/maint-bisect-paths:
  bisect: error out when passing bad path parameters

* mw/maint-gcc-warns-unused-write:
  run-command.c: fix build warnings on Ubuntu

* as/maint-expire:
  reflog: honor gc.reflogexpire=never
  prune: honor --expire=never

* ml/maint-grep-doc:
  grep docs: document --no-index option
  grep docs: --cached and <tree>... are incompatible
  grep docs: use AsciiDoc literals consistently
  grep docs: pluralize "Example" section

* fn/maint-mkdtemp-compat:
  Fix gitmkdtemp: correct test for mktemp() return value

* gb/maint-submodule-env:
  is_submodule_modified(): clear environment properly
  submodules: ensure clean environment when operating in a submodule
  shell setup: clear_local_git_env() function
  rev-parse: --local-env-vars option
  Refactor list of of repo-local env vars

* ne/pack-local-doc:
  pack-objects documentation: Fix --honor-pack-keep as well.
  pack-objects documentation: reword "objects that appear in the standard input"
  Documentation: pack-objects: Clarify --local's semantics.

* mb/shortlog-nongit-stdin:
  shortlog: warn the user when there is no input

* jk/maint-push-tracking-wo-remote:
  push: fix segfault for odd config

* jc/fetch-param:
  fetch --all/--multiple: keep all the fetched branch information
  builtin-fetch --all/--multi: propagate options correctly
  t5521: fix and modernize

* il/loosen-remote-helper-names:
  Allow '+', '-' and '.' in remote helper names