git, branch v2.31.0-rc0

Git 2.31-rc0

2021-02-26T00:43:33Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/push-delete-nothing'

2021-02-26T00:43:33Z

"git push $there --delete ''" should have been diagnosed as an error, but instead turned into a matching push, which has been corrected. * jc/push-delete-nothing: push: do not turn --delete '' into a matching push

Merge branch 'sh/mergetools-vimdiff1'

2021-02-26T00:43:32Z

Mergetools update. * sh/mergetools-vimdiff1: mergetools/vimdiff: add vimdiff1 merge tool variant

Merge branch 'dl/doc-config-camelcase'

2021-02-26T00:43:32Z

A handful of multi-word configuration variable names in documentation that are spelled in all lowercase have been corrected to use the more canonical camelCase. * dl/doc-config-camelcase: index-format doc: camelCase core.excludesFile blame-options.txt: camelcase blame.blankBoundary i18n.txt: camel case and monospace "i18n.commitEncoding"

Merge branch 'js/params-vs-args'

2021-02-26T00:43:32Z

Messages update. * js/params-vs-args: replace "parameters" by "arguments" in error messages

Merge branch 'ug/doc-commit-approxidate'

2021-02-26T00:43:32Z

Doc update. * ug/doc-commit-approxidate: doc: mention approxidates for git-commit --date

Merge branch 'es/maintenance-of-bare-repositories'

2021-02-26T00:43:32Z

The "git maintenance register" command had trouble registering bare repositories, which had been corrected. * es/maintenance-of-bare-repositories: maintenance: fix incorrect `maintenance.repo` path with bare repository

Merge branch 'mt/add-chmod-fixes'

2021-02-26T00:43:31Z

Various fixes on "git add --chmod". * mt/add-chmod-fixes: add: propagate --chmod errors to exit status add: mark --chmod error string for translation add --chmod: don't update index when --dry-run is used

Merge branch 'ds/merge-base-independent'

2021-02-26T00:43:31Z

The code to implement "git merge-base --independent" was poorly done and was kept from the very beginning of the feature. * ds/merge-base-independent: commit-reach: stale commits may prune generation further commit-reach: use heuristic in remove_redundant() commit-reach: move compare_commits_by_gen commit-reach: use one walk in remove_redundant() commit-reach: reduce requirements for remove_redundant()

Merge branch 'ah/rebase-no-fork-point-config'

2021-02-26T00:43:31Z

"git rebase --[no-]fork-point" gained a configuration variable rebase.forkPoint so that users do not have to keep specifying a non-default setting. * ah/rebase-no-fork-point-config: rebase: add a config option for --no-fork-point