Merge branch 'master' of git://git.ozlabs.org/~paulus/gitk

Junio C Hamano committed over 4 years ago

SubmittingPatches: use more stable git.ozlabs.org URL

Junio C Hamano committed over 4 years ago

gitk: include y coord in recorded sash position

halilsen committed over 4 years ago

gitk: trivial indentation fix

halilsen committed over 4 years ago

0th batch for topics from the previous cycle

Junio C Hamano committed over 4 years ago

Merge branch 'ea/progress-partial-blame'

Junio C Hamano committed over 4 years ago

Merge branch 'fr/vimdiff-layout'

Junio C Hamano committed over 4 years ago

Merge branch 'jh/p4-various-fixups'

Junio C Hamano committed over 4 years ago

Merge branch 'tk/untracked-cache-with-uall'

Junio C Hamano committed over 4 years ago

Merge branch 'ab/misc-cleanup'

Junio C Hamano committed over 4 years ago

unpack-trees: preserve index sparsity

Victoria Dye committed over 4 years ago

stash: apply stash using 'merge_ort_nonrecursive()'

Victoria Dye committed over 4 years ago

read-cache: set sparsity when index is new

Victoria Dye committed over 4 years ago

sparse-index: expose 'is_sparse_index_allowed()'

Victoria Dye committed over 4 years ago

stash: integrate with sparse index

Victoria Dye committed over 4 years ago

stash: expand sparse-checkout compatibility testing

Victoria Dye committed over 4 years ago

builtin/remote.c: teach `-v` to list filters for promisor remotes

Abhradeep Chakraborty committed over 4 years ago

detect-compiler: make detection independent of locale

Michael J Gruber committed over 4 years ago

Sync with v2.36.1

Junio C Hamano committed over 4 years ago

Git 2.36.1

Junio C Hamano committed over 4 years ago