Merge branch 'jk/checkout-attribute-lookup' into jch

Codepath to stream blob object contents directly from the object
store to filesystem did not use the correct path to find conversion
filters when writing to temporary files.

Will merge to 'next'.

* jk/checkout-attribute-lookup:
  entry: fix filter lookup
  t2003: modernize style
Merge branch 'jk/difftool-dir-diff-edit-fix' into jch

"git difftool --dir-diff" made symlinks to working tree files when
preparing a temporary directory structure, so that accidental edits
of these files in the difftool are reflected back to the working
tree, but the logic to decide when to do so was not quite right.

Will merge to 'next'.

* jk/difftool-dir-diff-edit-fix:
  difftool --dir-diff: symlink all files matching the working tree
  difftool: avoid double slashes in symlink targets
  git-difftool(1): fix formatting of --symlink description
### match next
Merge branch 'ap/combine-diff-ignore-whitespace' into jch

* ap/combine-diff-ignore-whitespace:
  Allow combined diff to ignore white-spaces
Merge branch 'jc/format-patch' into jch

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 'nd/branch-show-rebase-bisect-state' into jch

The changes look sound, but some patches need better description.

* 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()
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 'tr/line-log' into pu

Expecting a reroll.
$gmane/217278

* tr/line-log:
  log -L: :pattern:file syntax to find by funcname
  Implement line-history search (git log -L)
  Export rewrite_parents() for 'log -L'
  blame: introduce $ as "end of file" in -L syntax
  Refactor parse_loc

Conflicts:
	log-tree.c
Merge branch 'pc/subtree-add-before-fetch' into pu

Will discard.
Not getting enough reviews.

* pc/subtree-add-before-fetch:
  contrib/subtree: allow addition of remote branch with name not locally present
Merge branch 'gp/forbid-describe-all-match' into pu

"describe --match=<pattern> --all <commit>" ought to mean "use refs
that match <pattern> to describe <commit>; you do not have to limit
yourself to annotated tags."  But it doesn't.  Disable the
combination.

Will discard.

jc/describe topic fixes the semantics of --match used with --all
option.

* gp/forbid-describe-all-match:
  describe: make --all and --match=PATTERN mutually incompatible
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
git status: document trade-offs in choosing parameters to the -u option

In some repostories users experience that "git status" command takes
long time.  The command spends some time searching the file system
for untracked files.

Explain the trade-off struck by the default choice of `normal` to
help users make an appropriate choice better, before talking about
the configuration variable.

Inspired by Torsten Bögershausen.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
status: advise to consider use of -u when read_directory takes too long

Introduce advice.statusUoption to suggest considering use of -u to
strike different trade-off when it took more than 2 seconds to
enumerate untracked/ignored files.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'tb/document-status-u-tradeoff' into pu

* 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