git/t, branch v2.11.2

Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maint

2017-01-31T21:32:09Z

Tighten a test to avoid mistaking an extended ERE regexp engine as a PRE regexp engine. * jk/grep-e-could-be-extended-beyond-posix: t7810: avoid assumption about invalid regex syntax

Merge branch 'km/branch-get-push-while-detached' into maint

2017-01-31T21:32:08Z

"git @{push}" on a detached HEAD used to segfault; it has been corrected to error out with a message. * km/branch-get-push-while-detached: branch_get_push: do not segfault when HEAD is detached

Merge branch 'jk/blame-fixes' into maint

2017-01-31T21:32:07Z

"git blame --porcelain" misidentified the "previous" pair (aka "source") when contents came from two or more files. * jk/blame-fixes: blame: output porcelain "previous" header for each file blame: handle --no-abbrev blame: fix alignment with --abbrev=40

Merge branch 'jk/archive-zip-userdiff-config' into maint

2017-01-31T21:32:07Z

"git archive" did not read the standard configuration files, and failed to notice a file that is marked as binary via the userdiff driver configuration. * jk/archive-zip-userdiff-config: archive-zip: load userdiff config

Merge branch 'dt/disable-bitmap-in-auto-gc' into maint

2017-01-31T21:32:06Z

It is natural that "git gc --auto" may not attempt to pack everything into a single pack, and there is no point in warning when the user has configured the system to use the pack bitmap, leading to disabling further "gc". * dt/disable-bitmap-in-auto-gc: repack: die on incremental + write-bitmap-index auto gc: don't write bitmaps for incremental repacks

Merge branch 'mh/fast-import-notes-fix-new' into maint

2017-01-31T21:32:05Z

"git fast-import" sometimes mishandled while rebalancing notes tree, which has been fixed. * mh/fast-import-notes-fix-new: fast-import: properly fanout notes when tree is imported

Merge branch 'jc/compression-config' into maint

2017-01-31T21:32:05Z

Compression setting for producing packfiles were spread across three codepaths, one of which did not honor any configuration. Unify these so that all of them honor core.compression and pack.compression variables the same way. * jc/compression-config: compression: unify pack.compression configuration parsing

Merge branch 'ls/filter-process' into maint

2017-01-17T23:19:08Z

Doc update. * ls/filter-process: t0021: fix flaky test docs: warn about possible '=' in clean/smudge filter process values

Merge branch 'sb/t3600-cleanup' into maint

2017-01-17T23:19:07Z

Code cleanup. * sb/t3600-cleanup: t3600: slightly modernize style t3600: remove useless redirect

Merge branch 'sb/unpack-trees-grammofix' into maint

2017-01-17T23:19:05Z

* sb/unpack-trees-grammofix: unpack-trees: fix grammar for untracked files in directories