Merge branch 'ap/combine-diff-ignore-whitespace' into jch

Teach "diff --cc" output to honor options to ignore various forms
of whitespace changes.

Will merge to 'next'.

* ap/combine-diff-ignore-whitespace:
  Allow combined diff to ignore white-spaces
Merge branch 'jk/fully-peeled-packed-ref' into jch

Not that we do not actively encourage having annotated tags outside
refs/tags/ hierarchy, but they were not advertised correctly to the
ls-remote and fetch with recent version of Git.

Will merge to 'next'.

* jk/fully-peeled-packed-ref:
  pack-refs: add fully-peeled trait
  pack-refs: write peeled entry for non-tags
  use parse_object_or_die instead of die("bad object")
  avoid segfaults on parse_object failure

Conflicts:
	builtin/grep.c
Merge branch 'jk/peel-ref' into jch

Recent optimization broke shallow clones.

Will merge to 'next'.

* jk/peel-ref:
  upload-pack: load non-tip "want" objects from disk
  upload-pack: make sure "want" objects are parsed
  upload-pack: drop lookup-before-parse optimization
Merge branch 'nd/index-pack-l10n-buf-overflow' into jch

Will merge to 'next'.

* 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 'next'.

* nd/preallocate-hash:
  Preallocate hash tables when the number of inserts are known in advance
Merge branch 'pe/pull-rebase-v-q' into jch

Will merge to 'next'.

* pe/pull-rebase-v-q:
  pull: Apply -q and -v options to rebase mode as well
Merge branch 'rs/archive-zip-raw-compression' into jch

Will merge to 'next'.

* rs/archive-zip-raw-compression:
  archive-zip: use deflateInit2() to ask for raw compressed data
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 'next'.

* 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 'jk/fast-export-object-lookup' into jch

Will merge to 'next'.

* jk/fast-export-object-lookup:
  fast-export: do not load blob objects twice
  fast-export: rename handle_object function
Merge branch 'nd/branch-show-rebase-bisect-state' into jch

Will merge to 'next'.

* nd/branch-show-rebase-bisect-state:
  branch: show more information when HEAD is detached
  status: show more info than "currently not on any branch"
  wt-status: move wt_status_get_state() out to wt_status_print()
  wt-status: split wt_status_state parsing function out
  wt-status: move strbuf into read_and_strip_branch()
### match next
Merge branch 'sw/safe-create-leading-dir-race' into jch

Waiting for response to review comments.

* sw/safe-create-leading-dir-race:
  SQUASH???
  safe_create_leading_directories: fix race that could give a false negative
Merge branch 'jc/format-patch' into pu

A new option to send a single patch to the standard output to be
appended at the bottom of a message.  I personally have no need for
this, but it was easy enough to cobble together.  Tests, docs and
stripping out more MIMEy stuff are left as exercises to interested
parties.

Not ready for inclusion.

* jc/format-patch:
  format-patch: --inline-single
  format-patch: rename "no_inline" field
Merge branch 'mg/qnx6' into pu

Still under discussion.
Not ready for inclusion.

* mg/qnx6:
  QNX: newer QNX 6.x.x is not so crippled
Merge branch 'mb/gitweb-highlight-link-target' into pu

Expecting a reroll.
$gmane/211935

* mb/gitweb-highlight-link-target:
  Highlight the link target line in Gitweb using CSS
Merge branch 'mb/remote-default-nn-origin' into pu

When the user does not specify what remote to interact with, we
often attempt to use 'origin'.  This can now be customized via a
configuration variable.

Expecting a reroll.
$gmane/210151

"The first remote becomes the default" bit is better done as a
separate step.

* mb/remote-default-nn-origin:
  Teach get_default_remote to respect remote.default.
  Test that plain "git fetch" uses remote.default when on a detached HEAD.
  Teach clone to set remote.default.
  Teach "git remote" about remote.default.
  Teach remote.c about the remote.default configuration setting.
  Rename remote.c's default_remote_name static variables.

Conflicts:
	builtin/remote.c
	t/t5505-remote.sh
Merge branch 'hv/config-from-strbuf' into pu

Expecting a reroll.
$gmane/217811

* hv/config-from-strbuf:
  teach config parsing to read from strbuf
  config: make parsing stack struct independent from actual data source
  config: drop file pointer validity check in get_next_char()
  config: factor out config file stack management
Merge branch 'po/help-guides' into pu

Give more visibility to "concept guides" to help "git help" users.

Expecting a reroll.
$gmane/217384

* po/help-guides:
  help doc: include --guide option description
  help.c: add list_common_guides_help() function
  help.c: add --guide option
  help.c: use OPT_COUNTUP
  show 'git help <guide>' usage, with examples
Merge branch 'nd/magic-pathspecs' into pu

Migrate the rest of codebase to use "struct pathspec" more.

Expecting a reroll, but this is overall going in the right direction.
$gmane/218385

* nd/magic-pathspecs: (45 commits)
  Rename field "raw" to "_raw" in struct pathspec
  pathspec: support :(glob) syntax
  pathspec: make --literal-pathspecs disable pathspec magic
  pathspec: support :(literal) syntax for noglob pathspec
  Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
  parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
  parse_pathspec: make sure the prefix part is wildcard-free
  tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
  Remove match_pathspec() in favor of match_pathspec_depth()
  Remove init_pathspec() in favor of parse_pathspec()
  Remove diff_tree_{setup,release}_paths
  Convert common_prefix() to use struct pathspec
  Convert add_files_to_cache to take struct pathspec
  Convert {read,fill}_directory to take struct pathspec
  Convert refresh_index to take struct pathspec
  Convert report_path_error to take struct pathspec
  checkout: convert read_tree_some to take struct pathspec
  Convert unmerge_cache to take struct pathspec
  Convert run_add_interactive to use struct pathspec
  Convert read_cache_preload() to take struct pathspec
  ...

Conflicts:
	archive.c
	setup.c