git, branch v1.8.5-rc1

Git 1.8.5-rc1

2013-11-06T22:35:19Z

Signed-off-by: Junio C Hamano

Merge branch 'fc/trivial'

2013-11-06T22:34:43Z

A random collection of style fixes and minor doc updates. * fc/trivial: setup: trivial style fixes run-command: trivial style fixes diff: trivial style fix revision: trivial style fixes pretty: trivial style fix describe: trivial style fixes transport-helper: trivial style fix sha1-name: trivial style cleanup branch: trivial style fix revision: add missing include doc/pull: clarify the illustrations t: replace pulls with merges merge: simplify ff-only option

Update draft release notes to 1.8.5

2013-11-04T23:05:08Z

Signed-off-by: Junio C Hamano

Merge branch 'bw/solaris-sed-tr-test-portability'

2013-11-04T22:58:20Z

* bw/solaris-sed-tr-test-portability: t4015: simplify sed command that is not even seen by sed Avoid difference in tr semantics between System V and BSD Change sed i\ usage to something Solaris' sed can handle

Merge branch 'vd/doc-unpack-objects'

2013-11-04T22:58:16Z

* vd/doc-unpack-objects: Documentation: "pack-file" is not literal in unpack-objects Documentation: restore a space in unpack-objects usage

Merge branch 'jk/duplicate-objects-in-packs'

2013-11-04T22:58:10Z

Test fixup to a topic recently graduated. * jk/duplicate-objects-in-packs: Fix '\%o' for printf from coreutils

Merge branch 'jk/subtree-install-fix'

2013-11-04T22:58:08Z

* jk/subtree-install-fix: subtree: add makefile target for html docs

Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'

2013-11-04T22:58:05Z

* ak/cvsserver-stabilize-use-of-hash-keys: cvsserver: Determinize output to combat Perl 5.18 hash randomization

Merge branch 'jk/wrap-perl-used-in-tests'

2013-11-04T22:58:02Z

* jk/wrap-perl-used-in-tests: t: use perl instead of "$PERL_PATH" where applicable t: provide a perl() function which uses $PERL_PATH

Merge branch 'sc/doc-howto-dumb-http'

2013-11-04T22:57:57Z

* sc/doc-howto-dumb-http: doc/howto: warn about (dumb)http server document being too old