grep: add grep.fullName config variable

This configuration variable sets the default for the --full-name option.

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'tc/commit-dry-run-exit-status-tests' into jch

* tc/commit-dry-run-exit-status-tests:
  demonstrate git-commit --dry-run exit code behaviour
Merge branch 'jk/shallow-update-fix' into jch

Serving objects from a shallow repository needs to write a
temporary file to be used, but the serving upload-pack may not have
write access to the repository which is meant to be read-only.

* jk/shallow-update-fix:
  shallow: verify shallow file after taking lock
  shallow: automatically clean up shallow tempfiles
  shallow: use stat_validity to check for up-to-date file
Merge branch 'cp/am-patch-format-doc' into jch

* cp/am-patch-format-doc:
  Documentation/git-am: typofix
  Documentation/git-am: Document supported --patch-format options

# Conflicts:
# 	Documentation/git-am.txt
Merge branch 'nd/tag-version-sort' into jch

Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.

* nd/tag-version-sort:
  tag: support --sort=<spec>
Merge branch 'dk/skip-prefix-scan-only-once' into jch

Update implementation of skip_prefix() to scan only once; given
that most "prefix" arguments to the inline function are constant
strings whose strlen() can be determined at the compile time, this
might actually make things worse with a compiler with sufficient
intelligence.

* dk/skip-prefix-scan-only-once:
  skip_prefix(): scan prefix only once
Merge branch 'jc/stash-pop-not-popped' into jch

"stash pop", upon failing to apply the stash, refrains from
discarding the stash to avoid information loss.  Be more explicit
in the error message.

The wording may want to get a bit more bikeshedding.

* jc/stash-pop-not-popped:
  stash pop: mention we did not drop the stash upon failing to apply
Merge branch 'jn/wt-status' into jch

Unify the codepaths that format new/modified/changed sections and
conflicted paths in the "git status" output and make it possible to
properly internationalize their output.

* jn/wt-status:
  wt-status: lift the artificual "at least 20 columns" floor
  wt-status: i18n of section labels
  wt-status: extract the code to compute width for labels
  wt-status: make full label string to be subject to l10n
Merge branch 'nd/upload-pack-shallow' into jch

* nd/upload-pack-shallow:
  upload-pack: send shallow info over stdin to pack-objects

# Conflicts:
# 	t/t5537-fetch-shallow.sh
# 	upload-pack.c
Merge branch 'es/sh-i18n-envsubst' into jch

* es/sh-i18n-envsubst:
  sh-i18n--envsubst: retire unused string_list_member()
Merge branch 'lt/request-pull' into jch

Discard the accumulated "heuristics" to guess from which branch the
result wants to be pulled from and make sure what the end user
specified is not second-guessed by "git request-pull", to avoid
mistakes.

* lt/request-pull:
  request-pull: documentation updates
  request-pull: resurrect "pretty refname" feature
  request-pull: test updates
  request-pull: pick up tag message as before
  request-pull: allow "local:remote" to specify names on both ends
  request-pull: more strictly match local/remote branches
Merge branch 'jk/mv-submodules-fix' into jch

* jk/mv-submodules-fix:
  mv: prevent mismatched data when ignoring errors.
  builtin/mv: fix out of bounds write

# Conflicts:
# 	t/t7001-mv.sh
Merge branch 'nd/indent-fix-connect-c' into jch

* nd/indent-fix-connect-c:
  connect.c: SP after "}", not TAB
Merge branch 'mh/remove-subtree-long-pathname-fix' into jch

* mh/remove-subtree-long-pathname-fix:
  entry.c: fix possible buffer overflow in remove_subtree()
  checkout_entry(): use the strbuf throughout the function
Merge branch 'jk/warn-on-object-refname-ambiguity' into jch

* jk/warn-on-object-refname-ambiguity:
  rev-list: disable object/refname ambiguity check with --stdin
  cat-file: restore warn_on_object_refname_ambiguity flag
  cat-file: fix a minor memory leak in batch_objects
  cat-file: refactor error handling of batch_objects
Merge branch 'nd/commit-editor-cleanup' into jch

"git commit --cleanup=<mode>" learned a new mode, scissors.

* nd/commit-editor-cleanup:
  commit: add --cleanup=scissors
  wt-status.c: move cut-line print code out to wt_status_add_cut_line
  wt-status.c: make cut_line[] const to shrink .data section a bit
Merge branch 'jk/lib-terminal-lazy' into jch

The test helper lib-terminal always run an actual test_expect_* when
included, which screwed up with the use of skil-all that may have to
be done later.

* jk/lib-terminal-lazy:
  t/lib-terminal: make TTY a lazy prerequisite
Merge branch 'ah/doc-gitk-config' into jch

* ah/doc-gitk-config:
  Documentation/gitk: document the location of the configulation file
Merge branch 'fr/add-interactive-argv-array' into jch

* fr/add-interactive-argv-array:
  add: use struct argv_array in run_add_interactive()
Merge branch 'jk/pack-bitmap' into jch

* jk/pack-bitmap:
  pack-objects: turn off bitmaps when skipping objects