delta/git.git, branch cc/perf-aggregate

perf/aggregate: sort JSON fields in output

2018-02-02T19:47:45+00:00

It is much easier to diff the output against a previous
one when the fields are sorted.

Helped-by: Philip Oakley 
Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

perf/aggregate: add --reponame option

2018-02-02T19:47:41+00:00

This makes it easier to use the aggregate script
on the command line when one wants to get the
"environment" fields set in the codespeed output.

Previously setting GIT_REPO_NAME was needed
for this purpose.

Helped-by: Eric Sunshine 
Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

perf/aggregate: add --subsection option

2018-02-02T19:47:37+00:00

This makes it easier to use the aggregate script
on the command line, to get results from
subsections.

Previously setting GIT_PERF_SUBSECTION was needed
for this purpose.

Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

First batch after 2.16

2018-01-23T21:21:10+00:00

Signed-off-by: Junio C Hamano

Merge branch 'nd/add-i-ignore-submodules'

2018-01-23T21:16:41+00:00

"git add -p" was taught to ignore local changes to submodules as
they do not interfere with the partial addition of regular changes
anyway.

* nd/add-i-ignore-submodules:
  add--interactive: ignore submodule changes except HEAD

Merge branch 'mm/send-email-fallback-to-local-mail-address'

2018-01-23T21:16:41+00:00

Instead of maintaining home-grown email address parsing code, ship
a copy of reasonably recent Mail::Address to be used as a fallback
in 'git send-email' when the platform lacks it.

* mm/send-email-fallback-to-local-mail-address:
  send-email: add test for Linux's get_maintainer.pl
  perl/Git: remove now useless email-address parsing code
  send-email: add and use a local copy of Mail::Address

Merge branch 'ab/doc-cat-file-e-still-shows-errors'

2018-01-23T21:16:41+00:00

Doc update.

* ab/doc-cat-file-e-still-shows-errors:
  cat-file doc: document that -e will return some output

Merge branch 'as/read-tree-prefix-doc-fix'

2018-01-23T21:16:41+00:00

Doc update.

* as/read-tree-prefix-doc-fix:
  doc/read-tree: remove obsolete remark

Merge branch 'ys/bisect-object-id-missing-conversion-fix'

2018-01-23T21:16:40+00:00

Fix for a commented-out code to adjust it to a rather old API change.

* ys/bisect-object-id-missing-conversion-fix:
  bisect: debug: convert struct object to object_id

Merge branch 'tg/stash-with-pathspec-fix'

2018-01-23T21:16:39+00:00

"git stash -- " incorrectly blew away untracked files in
the directory that matched the pathspec, which has been corrected.

* tg/stash-with-pathspec-fix:
  stash: don't delete untracked files that match pathspec