git, branch v2.15.0-rc2

Git 2.15-rc2

2017-10-19T05:49:17Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/branch-force-doc-readability-fix'

2017-10-19T05:45:45Z

Doc update. * jc/branch-force-doc-readability-fix: branch doc: sprinkle a few commas for readability

Merge branch 'dg/filter-branch-filter-order-doc'

2017-10-19T05:45:45Z

Update the documentation for "git filter-branch" so that the filter options are listed in the same order as they are applied, as described in an earlier part of the doc. * dg/filter-branch-filter-order-doc: doc: list filter-branch subdirectory-filter first

Merge branch 'jc/fetch-refspec-doc-update'

2017-10-19T05:45:45Z

"git fetch :" allows an object name on the side when the other side accepts such a request since Git v2.5, but the documentation was left stale. * jc/fetch-refspec-doc-update: fetch doc: src side of refspec could be full SHA-1

Merge branch 'wk/merge-options-gpg-sign-doc'

2017-10-19T05:45:43Z

Doc updates. * wk/merge-options-gpg-sign-doc: Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'

Sync with maint

2017-10-18T05:32:17Z

* maint: Prepare for 2.14.3

Prepare for 2.14.3

2017-10-18T05:24:09Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/ref-filter-colors-fix' into maint

2017-10-18T05:20:43Z

This is the "theoretically more correct" approach of simply stepping back to the state before plumbing commands started paying attention to "color.ui" configuration variable. * jk/ref-filter-colors-fix: tag: respect color.ui config Revert "color: check color.ui in git_default_config()" Revert "t6006: drop "always" color config tests" Revert "color: make "always" the same as "auto" in config" color: make "always" the same as "auto" in config provide --color option for all ref-filter users t3205: use --color instead of color.branch=always t3203: drop "always" color test t6006: drop "always" color config tests t7502: use diff.noprefix for --verbose test t7508: use test_terminal for color output t3701: use test-terminal to collect color output t4015: prefer --color to -c color.diff=always test-terminal: set TERM=vt100

Merge branch 'jc/doc-checkout' into maint

2017-10-18T05:19:14Z

Doc update. * jc/doc-checkout: checkout doc: clarify command line args for "checkout paths" mode

Merge branch 'tb/complete-describe' into maint

2017-10-18T05:19:14Z

Docfix. * tb/complete-describe: completion: add --broken and --dirty to describe