git, branch v2.11.0-rc0

Git 2.11-rc0

2016-10-31T20:19:53Z

Signed-off-by: Junio C Hamano

Merge branch 'nd/test-helpers'

2016-10-31T20:15:27Z

Update to the test framework made in 2.9 timeframe broke running the tests under valgrind, which has been fixed. * nd/test-helpers: valgrind: support test helpers

Merge branch 'sc/fmt-merge-msg-doc-markup-fix'

2016-10-31T20:15:26Z

Documentation fix. * sc/fmt-merge-msg-doc-markup-fix: Documentation/fmt-merge-msg: fix markup in example

Merge branch 'ak/sh-setup-dot-source-i18n-fix'

2016-10-31T20:15:25Z

Recent update to git-sh-setup (a library of shell functions that are used by our in-tree scripted Porcelain commands) included another shell library git-sh-i18n without specifying where it is, relying on the $PATH. This has been fixed to be more explicit by prefixing $(git --exec-path) output in front. * ak/sh-setup-dot-source-i18n-fix: git-sh-setup: be explicit where to dot-source git-sh-i18n from.

Merge branch 'rs/commit-pptr-simplify'

2016-10-31T20:15:25Z

Code simplification. * rs/commit-pptr-simplify: commit: simplify building parents list

Merge branch 'jk/rebase-config-insn-fmt-docfix'

2016-10-31T20:15:24Z

Documentation fix. * jk/rebase-config-insn-fmt-docfix: doc: fix missing "::" in config list

Merge branch 'ak/pre-receive-hook-template-modefix'

2016-10-31T20:15:23Z

A trivial clean-up to a recently graduated topic. * ak/pre-receive-hook-template-modefix: pre-receive.sample: mark it executable

Merge branch 'jk/common-main'

2016-10-31T20:15:23Z

A trivial clean-up to a recently graduated topic. * jk/common-main: git-compat-util: move content inside ifdef/endif guards

Merge branch 'aw/numbered-stash'

2016-10-31T20:15:22Z

The user always has to say "stash@{$N}" when naming a single element in the default location of the stash, i.e. reflogs in refs/stash. The "git stash" command learned to accept "git stash apply 4" as a short-hand for "git stash apply stash@{4}". * aw/numbered-stash: stash: allow stashes to be referenced by index only

Merge branch 'jt/trailer-with-cruft'

2016-10-31T20:15:22Z

Update "interpret-trailers" machinery and teaches it that people in real world write all sorts of crufts in the "trailer" that was originally designed to have the neat-o "Mail-Header: like thing" and nothing else. * jt/trailer-with-cruft: trailer: support values folded to multiple lines trailer: forbid leading whitespace in trailers trailer: allow non-trailers in trailer block trailer: clarify failure modes in parse_trailer trailer: make args have their own struct trailer: streamline trailer item create and add trailer: use list.h for doubly-linked list trailer: improve const correctness