Merge branch 'ld/osx-keychain-usage-fix'

Junio C Hamano committed about 4 years ago

Merge branch 'vd/scalar-doc'

Junio C Hamano committed about 4 years ago

Merge branch 'ds/doc-wo-whitelist'

Junio C Hamano committed about 4 years ago

Merge branch 'mb/config-document-include'

Junio C Hamano committed about 4 years ago

Merge branch 'sg/index-format-doc-update'

Junio C Hamano committed about 4 years ago

Merge branch 'ma/sparse-checkout-cone-doc-fix'

Junio C Hamano committed about 4 years ago

Merge branch 'ma/t4200-update'

Junio C Hamano committed about 4 years ago

Merge branch 'tl/pack-bitmap-error-messages'

Junio C Hamano committed about 4 years ago

Merge branch 'ab/squelch-empty-fsync-traces'

Junio C Hamano committed about 4 years ago

Merge branch 'js/commit-graph-parsing-without-repo-settings'

Junio C Hamano committed about 4 years ago

cmake: support local installations of git

Carlo Marcelo Arenas Belón committed about 4 years ago

write_midx_bitmap(): drop unused refs_snapshot parameter

Jeff King committed about 4 years ago

config.c: NULL check when reading protected config

Glen Choo committed about 4 years ago

fetch-pack: write effective filter to trace2

Jonathan Tan committed about 4 years ago

gitweb: remove title shortening heuristics

Julien Rouhaud committed about 4 years ago

ls-files: introduce "--format" option

ZheNing Hu committed about 4 years ago

merge: do not exit restore_state() prematurely

Elijah Newren committed about 4 years ago

merge: ensure we can actually restore pre-merge state

Elijah Newren committed about 4 years ago

merge: make restore_state() restore staged state too

Elijah Newren committed about 4 years ago

merge: fix save_state() to work when there are stat-dirty files

Elijah Newren committed about 4 years ago