git, branch v2.3.6

Git 2.3.6

2015-04-21T19:17:09Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/colors' into maint

2015-04-21T19:12:25Z

"diff-highlight" (in contrib/) used to show byte-by-byte differences, which meant that multi-byte characters can be chopped in the middle. It learned to pay attention to character boundaries (assuming the UTF-8 payload). * jk/colors: diff-highlight: do not split multibyte characters

Merge branch 'jk/test-annoyances' into maint

2015-04-21T19:12:24Z

Test fixes. * jk/test-annoyances: t5551: make EXPENSIVE test cheaper t5541: move run_with_cmdline_limit to test-lib.sh t: pass GIT_TRACE through Apache t: redirect stderr GIT_TRACE to descriptor 4 t: translate SIGINT to an exit

Merge branch 'pt/enter-repo-comment-fix' into maint

2015-04-21T19:12:23Z

Documentation update. * pt/enter-repo-comment-fix: enter_repo(): fix docs to match code

Merge branch 'jz/gitweb-conf-doc-fix' into maint

2015-04-21T19:12:22Z

Documentation update. * jz/gitweb-conf-doc-fix: gitweb.conf.txt: say "build-time", not "built-time"

Merge branch 'jk/cherry-pick-docfix' into maint

2015-04-21T19:12:21Z

* jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits

Merge branch 'iu/fix-parse-options-h-comment' into maint

2015-04-21T19:12:20Z

* iu/fix-parse-options-h-comment: parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval

Merge branch 'jg/cguide-we-cannot-count' into maint

2015-04-21T19:12:19Z

* jg/cguide-we-cannot-count: CodingGuidelines: update 'rough' rule count

Merge branch 'jk/pack-corruption-post-mortem' into maint

2015-04-21T19:12:18Z

Documentation update. * jk/pack-corruption-post-mortem: howto: document more tools for recovery corruption

Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint

2015-04-21T19:12:17Z

Documentation update. * jn/doc-fast-import-no-16-octopus-limit: fast-import doc: remove suggested 16-parent limit