Merge branch 'jc/color-diff-doc' into jch

Will merge to 'master' in the 1st batch (Trivially Safe).

* jc/color-diff-doc:
  diff-options: unconfuse description of --color
Merge branch 'wk/doc-pre-rebase' into jch

Will merge to 'master' in the 1st batch (Trivially Safe).

* wk/doc-pre-rebase:
  Documentation/githooks: Explain pre-rebase parameters
Merge branch 'nd/doc-index-format' into jch

Update the index format documentation to mention the v4 format.

Will merge to 'master' in the 1st batch (Trivially Safe).

* nd/doc-index-format:
  update-index: list supported idx versions and their features
  read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()
  index-format.txt: mention of v4 is missing in some places
Merge branch 'da/downcase-u-in-usage' into jch

Will merge to 'master' in the 1st batch (Trivially Safe).

* da/downcase-u-in-usage:
  contrib/mw-to-git/t/install-wiki.sh: use a lowercase "usage:" string
  contrib/examples/git-remote.perl: use a lowercase "usage:" string
  tests: use a lowercase "usage:" string
  git-svn: use a lowercase "usage:" string
  Documentation/user-manual.txt: use a lowercase "usage:" string
  templates/hooks--update.sample: use a lowercase "usage:" string
  contrib/hooks/setgitperms.perl: use a lowercase "usage:" string
  contrib/examples: use a lowercase "usage:" string
  contrib/fast-import/import-zips.py: use spaces instead of tabs
  contrib/fast-import/import-zips.py: fix broken error message
  contrib/fast-import: use a lowercase "usage:" string
  contrib/credential: use a lowercase "usage:" string
  git-cvsimport: use a lowercase "usage:" string
  git-cvsimport: use a lowercase "usage:" string
  git-cvsexportcommit: use a lowercase "usage:" string
  git-archimport: use a lowercase "usage:" string
  git-merge-one-file: use a lowercase "usage:" string
  git-relink: use a lowercase "usage:" string
  git-svn: use a lowercase "usage:" string
  git-sh-setup: use a lowercase "usage:" string
Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into jch

Will merge to 'master' in the 1st batch (Trivially Safe).

* gp/avoid-explicit-mention-of-dot-git-refs:
  Fix ".git/refs" stragglers

Conflicts:
	Documentation/config.txt
Merge branch 'gp/describe-match-uses-glob-pattern' into jch

Will merge to 'master' in the 1st batch (Trivially Safe).

* gp/describe-match-uses-glob-pattern:
  describe: Document --match pattern format
Merge branch 'dm/ni-maxhost-may-be-missing' into jch

Will merge to 'master' in the 1st batch (Trivially Safe).

* dm/ni-maxhost-may-be-missing:
  git-compat-util.h: Provide missing netdb.h definitions
Merge branch 'rj/msvc-build' into jch

Will merge to 'master' in the 1st batch (Trivially Safe).

* rj/msvc-build:
  msvc: avoid collisions between "tags" and "TAGS"
  msvc: test-svn-fe: Fix linker "unresolved external" error
  msvc: Fix build by adding missing symbol defines
  msvc: git-daemon: Fix linker "unresolved external" errors
  msvc: Fix compilation errors caused by poll.h emulation
Merge branch 'wk/user-manual-literal-format' into jch

Will merge to 'master' in the 1st batch (Trivially Safe).

* wk/user-manual-literal-format:
  user-manual: Standardize backtick quoting
Merge branch 'tk/doc-filter-branch' into jch

Will merge to 'master' in the 1st batch (Trivially Safe).

* tk/doc-filter-branch:
  Documentation: filter-branch env-filter example
  git-filter-branch.txt: clarify ident variables usage
Merge branch 'jk/graph-c-expose-symbols-for-cgit' into jch

In the v1.8.0 era, we changed symbols that do not have to be global
to file scope static, but a few functions in graph.c were used by
CGit from sideways bypassing the entry points of the API the
in-tree users use.

Will merge to 'master' in the 1st batch (Trivially Safe).

* jk/graph-c-expose-symbols-for-cgit:
  Revert "graph.c: mark private file-scope symbols as static"
Merge branch 'lf/bundle-verify-list-prereqs' into jch

Will merge to 'master' in the 1st batch (Trivially Safe).

* lf/bundle-verify-list-prereqs:
  bundle: Add colons to list headings in "verify"
  bundle: Fix "verify" output if history is complete
Merge branch 'jc/add-2.0-u-A-sans-pathspec' (early part) into jch

* 'jc/add-2.0-u-A-sans-pathspec' (early part):
  t2200: check that "add -u" limits itself to subdirectory
Merge branch 'jc/maint-push-refspec-default-doc' into jch

Clarify in the documentation "what" gets pushed to "where" when the
command line to "git push" does not say these explicitly.

Will merge to 'master' in the 2nd batch (Trivially Safe).

* jc/maint-push-refspec-default-doc:
  Documentation/git-push: clarify the description of defaults
Merge branch 'jn/shell-disable-interactive' into jch

Will merge to 'master' in the 2nd batch (Trivially Safe).

* jn/shell-disable-interactive:
  shell: new no-interactive-login command to print a custom message
  shell doc: emphasize purpose and security model
Merge branch 'tb/document-status-u-tradeoff' into jch

Suggest users to look into using--untracked=no option when "git
status" takes too long.

Will merge to 'master' in the 2nd batch (Trivially Safe).

* tb/document-status-u-tradeoff:
  status: advise to consider use of -u when read_directory takes too long
  git status: document trade-offs in choosing parameters to the -u option

Conflicts:
	Documentation/config.txt
Merge branch 'nd/index-pack-l10n-buf-overflow' into jch

Will merge to 'master' in the 2nd batch (Trivially Safe).

* nd/index-pack-l10n-buf-overflow:
  index-pack: fix buffer overflow caused by translations
Merge branch 'nd/preallocate-hash' into jch

When we know approximately how many entries we will have in the
hash-table, it makes sense to size the hash table to that number
from the beginning to avoid unnecessary rehashing.

Will merge to 'master' in the 2nd batch (Trivially Safe).

* nd/preallocate-hash:
  Preallocate hash tables when the number of inserts are known in advance
Merge branch 'jc/fetch-raw-sha1' into jch

Allows requests to fetch objects at any tip of refs (including
hidden ones).  It seems that there may be use cases even outside
Gerrit (e.g. $gmane/215701).

Will merge to 'master' in the 2nd batch (Safe).

* jc/fetch-raw-sha1:
  fetch: fetch objects by their exact SHA-1 object names
  upload-pack: optionally allow fetching from the tips of hidden refs
  fetch: use struct ref to represent refs to be fetched
  parse_fetch_refspec(): clarify the codeflow a bit

Conflicts:
	cache.h
Merge branch 'nd/count-garbage' into jch

Will merge to 'master' in the 2nd batch (Safe).

* nd/count-garbage:
  count-objects: report how much disk space taken by garbage files
  count-objects: report garbage files in pack directory too
  sha1_file: reorder code in prepare_packed_git_one()
  git-count-objects.txt: describe each line in -v output