git/Documentation, branch v2.6.3

Git 2.6.3

2015-11-05T20:20:34Z

Signed-off-by: Junio C Hamano

Merge branch 'rs/daemon-plug-child-leak' into maint

2015-11-05T20:18:17Z

"git daemon" uses "run_command()" without "finish_command()", so it needs to release resources itself, which it forgot to do. * rs/daemon-plug-child-leak: daemon: plug memory leak run-command: factor out child_process_clear()

Merge branch 'xf/user-manual-ff' into maint

2015-11-04T22:20:49Z

* xf/user-manual-ff: user-manual: fix the description of fast-forward

Merge branch 'xf/user-manual-markup' into maint

2015-11-04T22:20:47Z

AsciiDoc markup fixes. * xf/user-manual-markup: Documentation: match undefline with the text in old release notes Documentation: match underline with the text Documentation: fix header markup

Merge branch 'jc/everyday-markup' into maint

2015-11-04T22:20:46Z

AsciiDoc markup fixes. * jc/everyday-markup: Documentation/everyday: match undefline with the text

Merge branch 'jc/em-dash-in-doc' into maint

2015-11-04T22:20:45Z

AsciiDoc markup fixes. * jc/em-dash-in-doc: Documentation: AsciiDoc spells em-dash as double-dashes, not triple

Merge branch 'jk/merge-file-exit-code' into maint

2015-11-03T23:32:41Z

"git merge-file" tried to signal how many conflicts it found, which obviously would not work well when there are too many of them. * jk/merge-file-exit-code: merge-file: clamp exit code to maximum 127

Merge branch 'jc/usage-stdin' into maint

2015-11-03T23:32:38Z

The synopsis text and the usage string of subcommands that read list of things from the standard input are often shown as if they only take input from a file on a filesystem, which was misleading. * jc/usage-stdin: usage: do not insist that standard input must come from a file

Merge branch 'jk/repository-extension' into maint

2015-11-03T23:32:25Z

Prepare for Git on-disk repository representation to undergo backward incompatible changes by introducing a new repository format version "1", with an extension mechanism. * jk/repository-extension: introduce "preciousObjects" repository extension introduce "extensions" form of core.repositoryformatversion

run-command: factor out child_process_clear()

2015-11-02T23:01:00Z

Avoid duplication by moving the code to release allocated memory for arguments and environment to its own function, child_process_clear(). Export it to provide a counterpart to child_process_init(). Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano