Merge branch 'nd/attr-debug-fix' into pu

* nd/attr-debug-fix:
  attr: make it build with DEBUG_ATTR again
Merge branch 'nd/fix-directory-attrs-off-by-one' into pu

* nd/fix-directory-attrs-off-by-one:
  attr: fix off-by-one directory component length calculation
Merge branch 'nd/fix-perf-parameters-in-tests' into pu

# By Nguyễn Thái Ngọc Duy
* nd/fix-perf-parameters-in-tests:
  test-lib.sh: unfilter GIT_PERF_*

Conflicts:
	t/test-lib.sh
Merge branch 'fc/remote-hg-fixup-url' into pu

* fc/remote-hg-fixup-url:
  remote-hg: store converted URL
Merge branch 'mh/remote-hg-mode-bits-fix' into pu

* mh/remote-hg-mode-bits-fix:
  remote-hg: fix handling of file perms when pushing
Merge branch 'ph/rebase-preserve-all-merges' into pu

An earlier change to add --keep-empty option broke "git rebase
--preserve-merges" and lost merge commits that end up being the
same as its parent.

Will merge to 'next'.

* ph/rebase-preserve-all-merges:
  rebase --preserve-merges: keep all merge commits including empty ones
Merge branch 'rs/archive-tar-config-parsing-fix' into pu

Configuration parsing for tar.* configuration variables were
broken; Peff's config parsing clean-up topic will address the same
breakage, so this may be superseded by that other topic.

* rs/archive-tar-config-parsing-fix:
  archive-tar: fix sanity check in config parsing
Merge branch 'rs/pretty-use-prefixcmp' into pu

Will merge to 'next'.

* rs/pretty-use-prefixcmp:
  pretty: use prefixcmp instead of memcmp on NUL-terminated strings
Merge branch 'as/pre-push-hook' into pu

Add an extra hook so that "git push" that is run without making
sure what is being pushed is sane can be checked and rejected (as
opposed to the user deciding not pushing).

* as/pre-push-hook:
  Add sample pre-push hook script
  [SQUASH???] t5571 sample hooks should consume their input
  push: Add support for pre-push hooks
  hooks: Add function to check if a hook exists
Merge branch 'jc/cvsimport-upgrade' into pu

The most important part of this series is the addition of the new
cvsimport by Eric Raymond that works with cvsps 3.x.  Given some
distros have inertia to be conservative, Git with cvsimport that
does not work with both 3.x will block adoption of cvsps 3.x by
them, and shipping Git with cvsimport that does not work with cvsps
2.x will block such a version of Git, so we'll do the proven "both
old and new are available, but we aim to deprecate and remove the
old one in due time" strategy that we used successfully in the
past.

* jc/cvsimport-upgrade:
  t9600: adjust for new cvsimport
  t9600: further prepare for sharing
  cvsimport-3: add a sample test
  cvsimport: make tests reusable for cvsimport-3
  cvsimport: start adding cvsps 3.x support
  cvsimport: introduce a version-switch wrapper
  cvsimport: allow setting a custom cvsps (2.x) program name
  Makefile: add description on PERL/PYTHON_PATH
Merge branch 'mh/imap-send-shrinkage' into pu

* mh/imap-send-shrinkage:
  imap-send.c: simplify logic in lf_to_crlf()
  imap-send.c: fold struct store into struct imap_store
  imap-send.c: remove unused field imap_store::uidvalidity
  imap-send.c: use struct imap_store instead of struct store
  imap-send.c: remove unused field imap_store::trashnc
  imap-send.c: remove namespace fields from struct imap
  imap-send.c: remove struct imap argument to parse_imap_list_l()
  imap-send.c: inline imap_parse_list() in imap_list()
  imap-send.c: remove some unused fields from struct store
  imap-send.c: remove struct message
  imap-send.c: remove struct store_conf
  iamp-send.c: remove unused struct imap_store_conf
  imap-send.c: remove struct msg_data
  imap-send.c: remove msg_data::flags, which was always zero
Merge branch 'pw/p4-branch-fixes' into pu

* pw/p4-branch-fixes:
  git p4: fix submit when no master branch
  git p4 test: keep P4CLIENT changes inside subshells
  git p4: fix sync --branch when no master branch
  git p4: fail gracefully on sync with no master branch
  git p4: rearrange self.initialParent use
  git p4: allow short ref names to --branch
  git p4 doc: fix branch detection example
  git p4: clone --branch should checkout master
  git p4: verify expected refs in clone --bare test
  git p4: create p4/HEAD on initial clone
  git p4: inline listExistingP4GitBranches
  git p4: add comments to p4BranchesInGit
  git p4: rearrange and simplify hasOrigin handling
  git p4: test sync/clone --branch behavior
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:
  reset [--mixed]: use diff-based reset whether or not pathspec was given
  reset: allow reset on unborn branch
  reset $sha1 $pathspec: require $sha1 only to be treeish
  reset.c: inline update_index_refresh()
  reset.c: finish entire cmd_reset() whether or not pathspec is given
  reset [--mixed]: only write index file once
  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.c: replace switch by if-else
  reset: avoid redundant error message
  reset --keep: only write index file once
  reset.c: share call to die_if_unmerged_cache()
  reset.c: extract function for updating {ORIG_,}HEAD
  reset.c: remove unnecessary variable 'i'
  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
  reset $pathspec: exit with code 0 if successful
  reset $pathspec: no need to discard index
Merge branch 'jc/valgrind-memcmp-bsearch' into pu

* jc/valgrind-memcmp-bsearch:
  ignore memcmp() overreading in bsearch() callback
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 'dl/am-hg-locale' into pu

Datestamp recorded in "Hg" format patch was reformatted incorrectly
to an e-mail looking date using locale dependant strftime, causing
patch application to fail.

* dl/am-hg-locale:
  am: invoke perl's strftime in C locale
### Expecting a reroll
Merge branch 'dg/subtree-fixes' into pu

contrib/subtree updates.

Rerolled?

* dg/subtree-fixes:
  contrib/subtree: mkdir the manual directory if needed
  contrib/subtree: honor $(DESTDIR)
  contrib/subtree: fix synopsis and command help
  contrib/subtree: better error handling for "add"
  contrib/subtree: add --unannotate option
  contrib/subtree: use %B for split Subject/Body
  t7900: remove test number comments
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