Merge branch 'ps/build-meson-fixes-0130'

Junio C Hamano committed over 1 year ago

Merge branch 'dk/test-aggregate-results-paste-fix'

Junio C Hamano committed over 1 year ago

editorconfig: add .bash extension

David Mandelberg committed over 1 year ago

meson: fix building technical and howto docs

Phillip Wood committed over 1 year ago

builtin/diff-pairs: allow explicit diff queue flush

Justin Tobler committed over 1 year ago

builtin: introduce diff-pairs command

Justin Tobler committed over 1 year ago

diff: add option to skip resolving diff statuses

Justin Tobler committed over 1 year ago

diff: return diff_filepair from diff queue helpers

Justin Tobler committed over 1 year ago

doc: fix build-docdep.perl

Junio C Hamano committed over 1 year ago

contrib/subtree: rename .txt to .adoc

Todd Zullinger committed over 1 year ago

contrib/contacts: rename .txt to .adoc

Todd Zullinger committed over 1 year ago

doc: update howto-index.sh for .adoc extensions

Todd Zullinger committed over 1 year ago

Merge branch 'ps/meson-contrib-bits' into tz/doc-txt-to-adoc-fixes

Junio C Hamano committed over 1 year ago

path: adjust last remaining users of `the_repository`

Patrick Steinhardt committed over 1 year ago

environment: move access to "core.sharedRepository" into repo settings

Patrick Steinhardt committed over 1 year ago

environment: move access to "core.hooksPath" into repo settings

Patrick Steinhardt committed over 1 year ago

repo-settings: introduce function to clear struct

Patrick Steinhardt committed over 1 year ago

path: drop `git_path()` in favor of `repo_git_path()`

Patrick Steinhardt committed over 1 year ago

rerere: let `rerere_path()` write paths into a caller-provided buffer

Patrick Steinhardt committed over 1 year ago

A bit more post -rc0

Junio C Hamano committed over 1 year ago