* maint:

* bs/maint-pre-commit-hook-sample:
  pre-commit.sample: Diff against the empty tree when HEAD is invalid

* js/maint-diff-color-words:
  diff --color-words: bit of clean-up
  diff --color-words -U0: fix the location of hunk headers
  t4034-diff-words: add a test for word diff without context

Conflicts:
	diff.c

* rs/pretty-wrap:
  log --format: don't ignore %w() at the start of format string
  Implement wrap format %w() as if it is a mode switch

Conflicts:
	pretty.c

* js/log-rewrap:
  Teach --wrap to only indent without wrapping
  Add strbuf_add_wrapped_text() to utf8.[ch]
  print_wrapped_text(): allow hard newlines

* fc/doc-fast-forward:
  Use 'fast-forward' all over the place

Conflicts:
	builtin-merge.c

* sc/difftool-p4merge:
  mergetool--lib: add p4merge as a pre-configured mergetool option

* jk/maint-add-p-empty:
  add-interactive: handle deletion of empty files

* lt/revision-bisect:
  Add '--bisect' revision machinery argument

* jc/maint-1.6.3-graft-trailing-space:
  info/grafts: allow trailing whitespaces at the end of line

* tr/maint-roff-quote:
  Quote ' as \(aq in manpages

* ja/fetch-doc:
  Documentation/merge-options.txt: order options in alphabetical groups
  Documentation/git-pull.txt: Add subtitles above included option files
  Documentation/fetch-options.txt: order options alphabetically

* cb/doc-fetch-pull-merge:
  modernize fetch/merge/pull examples

* jk/maint-cvsimport-pathname:
  cvsimport: fix relative argument filenames

* jc/receive-pack-auto:
  receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
  gc --auto --quiet: make the notice a bit less verboase

* gb/maint-gitweb-esc-param:
  gitweb: fix esc_param

* jn/gitweb-patch:
  gitweb: Do not show 'patch' link for merge commits

* maint:
  git-add.txt: fix formatting of --patch section

Signed-off-by: NBjörn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Extra paragraphs should be prefixed with a plus sign.
Signed-off-by: NStephen Boyd <bebarino@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:
  check-ref-format -h: it does not know the --print option yet

... but it does on the 'master' branch.

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

A multi-line SYNOPSIS description must be marked as [verse]
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:
  merge: do not setup worktree twice
  check-ref-format: update usage string

Conflicts:
	builtin-check-ref-format.c

* jk/maint-format-patch-p-suppress-stat:
  format-patch: make "-p" suppress diffstat

* pb/maint-gitweb-blob-lineno:
  gitweb: Fix blob linenr links in pathinfo mode

* tr/describe-advice:
  describe: when failing, tell the user about options that work

* jk/maint-1.6.3-ls-files-i:
  ls-files: unbreak "ls-files -i"

* bg/merge-ff-only:
  Teach 'git merge' and 'git pull' the option --ff-only

* vl/maint-openssl-signature-change:
  imap-send.c: fix compiler warnings for OpenSSL 1.0

* jk/maint-push-config:
  push: always load default config

* jk/gitignore-anchored:
  gitignore: root most patterns at the top-level directory

Conflicts:
	.gitignore

* jp/dirty-describe:
  Teach "git describe" --dirty option

* sr/blame-incomplete:
  blame: make sure that the last line ends in an LF

Builtins do not need to run setup_worktree() for themselves, since
the builtin machinery runs it for them.
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

'git check-ref-format' has learned --branch and --print options
since the usage string was last updated.
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Add the description next to --assume-unchanged because this option is only
useful in a special case of using that option.
Signed-off-by: NŠtěpán Němec <stepnem@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:
  Add intermediate build products to .gitignore

Temporaries such as configure.ac+ and Documentation/*.xml+
sometimes remain after an interrupted build.  Tell git not to
track them.
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Once upon a time, format-patch would use its default stat
plus patch format only when no diff format was given on the
command line. This meant that "format-patch -p" would
suppress the stat and show just the patch.

Commit 68daa64d changed this to keep the stat format when we
had an "implicit" patch format, like "-U5". As a side
effect, this meant that an explicit patch format was now
ignored (because cmd_format_patch didn't know the reason
that the format was set way down in diff_opt_parse).

This patch unbreaks what 68daa64d did (while still preserving
what 68daa64d was trying to do), reinstating "-p" to suppress
the default behavior. We do this by parsing "-p" ourselves
in format-patch, and noting whether it was used explicitly.
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>