Merge branch 'zk/clean-report-failure' into pu

"git clean" states what it is going to remove and then goes on to
remove it, but sometimes it only discovers things that cannot be
removed after recursing into a directory, which makes the output
confusing and even wrong.

Expecting a response to $gmane/212860.

* zk/clean-report-failure:
  [SQUASH???] style fixes
  git-clean: Display more accurate delete messages
Merge branch 'rt/commit-cleanup-config' into pu

Add a configuration variable to set default clean-up mode other
than "strip".

* rt/commit-cleanup-config:
  commit: make default of "cleanup" option configurable
Merge branch 'jc/custom-comment-char' into pu

An illustration to show codepaths that need to be touched to change
the hint lines in the edited text to begin with something other
than '#'.

* jc/custom-comment-char:
  Allow custom "comment char"
Merge branch 'jn/maint-trim-vim-contrib' into pu

Will merge to 'next'.

* jn/maint-trim-vim-contrib:
  contrib/vim: simplify instructions for old vim support
### Expecting a reroll
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 '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 'bc/append-signed-off-by' into pu

Expecting a reroll.
$gmane/212507

* bc/append-signed-off-by:
  t4014: do not use echo -n
  Unify appending signoff in format-patch, commit and sequencer
  format-patch: update append_signoff prototype
  format-patch: stricter S-o-b detection
  t4014: more tests about appending s-o-b lines
  sequencer.c: teach append_signoff to avoid adding a duplicate newline
  sequencer.c: teach append_signoff how to detect duplicate s-o-b
  sequencer.c: always separate "(cherry picked from" from commit body
  sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer
  t/t3511: add some tests of 'cherry-pick -s' functionality
  t/test-lib-functions.sh: allow to specify the tag name to test_commit
  sequencer.c: remove broken support for rfc2822 continuation in footer

Conflicts:
	builtin/log.c
	t/t4014-format-patch.sh
Merge branch 'nd/clone-no-separate-git-dir-with-bare' into pu

Expecting a reroll.
$gmane/212863

* nd/clone-no-separate-git-dir-with-bare:
  clone: forbid --bare --separate-git-dir <dir>
Merge branch 'mp/complete-paths' into pu

The completion script used to let the default completer to suggest
pathnames, which gave too many irrelevant choices (e.g. "git add"
would not want to add an unmodified path).  Teach it to use a more
git-aware logic to enumerate only relevant ones.

It has been reported (no surprise) that this does not work inside
subdirectory, and fixing it seems to be non-trivial. $gmane/212642

Waiting for area-experts' help.

* mp/complete-paths:
  git-completion.bash: add support for path completion

Conflicts:
	contrib/completion/git-completion.bash
### Stalled
Merge branch 'jc/xprm-generation' into pu

A toy to analyze how bad the clock skews are in histories of real
world projects.

Stalled mostly due to lack of responses.

* jc/xprm-generation:
  test-generation: compute generation numbers and clock skews
Merge branch 'jc/maint-name-rev' into pu

"git name-rev" names the given revision based on a ref that can be
reached in the smallest number of steps from the rev, but that is
not useful when the caller wants to know which tag is the oldest one
that contains the rev.  This teaches a new mode to the command that
uses the oldest ref among those which contain the rev.

I am not sure if this is worth it; for one thing, even with the help
from notes-cache, it seems to make the "describe --contains" even
slower. Also the command will be unusably slow for a user who does
not have a write access (hence unable to create or update the
notes-cache).

Stalled mostly due to lack of responses.

* jc/maint-name-rev:
  describe --contains: use "name-rev --algorithm=weight"
  name-rev --algorithm=weight: tests and documentation
  name-rev --algorithm=weight: cache the computed weight in notes
  name-rev --algorithm=weight: trivial optimization
  name-rev: --algorithm option
  name_rev: clarify the logic to assign a new tip-name to a commit
  name-rev: lose unnecessary typedef

Conflicts:
	builtin/name-rev.c
Merge branch 'jk/lua-hackery' into pu

Interesting exercise. When we do this for real, we probably would want
to wrap a commit to make it more like an "object" with methods like
"parents", etc.

* jk/lua-hackery:
  pretty: fix up one-off format_commit_message calls
  Minimum compilation fixup
  Makefile: make "lua" a bit more configurable
  add a "lua" pretty format
  add basic lua infrastructure
  pretty: make some commit-parsing helpers more public
Merge branch 'rc/maint-complete-git-p4' into pu

Comment from Pete will need to be addressed ($gmane/206172).

* rc/maint-complete-git-p4:
  Teach git-completion about git p4
Merge branch 'jl/submodule-deinit' into pu

There was no Porcelain way to say "I no longer am interested in
this submodule", once you express your interest in a submodule with
"submodule init".  "submodule deinit" is the way to do so.

Expecting a reroll.
$gmane/212884

* jl/submodule-deinit:
  submodule: add 'deinit' command

Conflicts:
	Documentation/git-submodule.txt
	git-submodule.sh
Merge branch 'jc/add-delete-default' into pu

"git add dir/" updated modified files and added new files, but does
not notice removed files, which may be "Huh?" to some users.  They
can of course use "git add -A dir/", but why should they?

Resurrected from graveyard, as I thought it was a worthwhile thing
to do in the longer term.

Stalled mostly due to lack of responses.

* jc/add-delete-default:
  git add: notice removal of tracked paths by default
### Conflicting
Merge branch 'nd/parse-pathspec' into pu

Uses the parsed pathspec structure in more places where we used to
use the raw "array of strings" pathspec.

Unfortunately, this conflicts a couple of topics in flight. I tried
to be careful while resolving conflicts, though.

Expecting a reroll after the dust settles.

* nd/parse-pathspec: (21 commits)
  Convert more init_pathspec() to parse_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 read_cache_preload() to take struct pathspec
  add: convert to use parse_pathspec
  archive: convert to use parse_pathspec
  ls-files: convert to use parse_pathspec
  rm: convert to use parse_pathspec
  checkout: convert to use parse_pathspec
  rerere: convert to use parse_pathspec
  status: convert to use parse_pathspec
  commit: convert to use parse_pathspec
  clean: convert to use parse_pathspec
  Export parse_pathspec() and convert some get_pathspec() calls
  pathspec: make sure the prefix part is wildcard-clean
  Add parse_pathspec() that converts cmdline args to struct pathspec
  ...

Conflicts:
	builtin/add.c
	builtin/ls-files.c
	cache.h
	dir.c
	setup.c
	tree-walk.c
	wt-status.c
Merge branch 'mz/reset-misc' into pu

Various 'reset' optimizations and clean-ups, followed by a change
to allow "git reset" to work even on an unborn branch.

* mz/reset-misc: (22 commits)
  reset [--mixed]: use diff-based reset whether or not pathspec was given
  [SQUASH???] script portability fixes
  reset: allow reset on unborn branch
  reset $sha1 $pathspec: require $sha1 only to be treeish
  reset [--mixed] --quiet: don't refresh index
  reset.c: finish entire cmd_reset() whether or not pathspec is given
  reset [--mixed]: don't write index file twice
  reset.c: move lock, write and commit out of update_index_refresh()
  reset.c: move update_index_refresh() call out of read_from_tree()
  reset: avoid redundant error message
  reset --keep: only write index file once
  reset.c: replace switch by if-else
  reset.c: share call to die_if_unmerged_cache()
  [SQUASH???] style fixes
  reset.c: extract function for updating {ORIG,}HEAD
  reset.c: remove unnecessary variable 'i'
  [SQUASH???] style fix
  reset.c: extract function for parsing arguments
  reset: don't allow "git reset -- $pathspec" in bare repo
  reset.c: pass pathspec around instead of (prefix, argv) pair
  ...