Merge branch 'ab/userdiff-tests'

Junio C Hamano committed over 5 years ago

Merge branch 'ar/userdiff-scheme'

Junio C Hamano committed over 5 years ago

git-completion.bash: separate some commands onto their own line

Denton Liu committed over 5 years ago

doc: clarify the filename encoding in git diff

Andrey Bienkowski committed over 5 years ago

ref-filter: reuse output buffer

ZheNing Hu committed over 5 years ago

ref-filter: get rid of show_ref_array_item

ZheNing Hu committed over 5 years ago

parallel-checkout: add design documentation

Matheus Tavares committed over 5 years ago

config: allow overriding of global and system configuration

Patrick Steinhardt committed over 5 years ago

config: unify code paths to get global config paths

Patrick Steinhardt committed over 5 years ago

config: rename `git_etc_config()`

Patrick Steinhardt committed over 5 years ago

rev-list: allow filtering of provided items

Patrick Steinhardt committed over 5 years ago

pack-bitmap: implement combined filter

Patrick Steinhardt committed over 5 years ago

pack-bitmap: implement object type filter

Patrick Steinhardt committed over 5 years ago

list-objects: implement object type filter

Patrick Steinhardt committed over 5 years ago

parallel-checkout: support progress displaying

Matheus Tavares committed over 5 years ago

parallel-checkout: add configuration options

Matheus Tavares committed over 5 years ago

parallel-checkout: make it truly parallel

Matheus Tavares committed over 5 years ago

unpack-trees: add basic support for parallel checkout

Matheus Tavares committed over 5 years ago

doc/diff-options: document new --diff-merges features

Sergey Organov committed over 5 years ago

diff-merges: introduce log.diffMerges config variable

Sergey Organov committed over 5 years ago