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

merge: do not abort early if one strategy fails to handle the merge

Elijah Newren committed about 4 years ago

merge: abort if index does not match HEAD for trivial merges

Elijah Newren committed about 4 years ago

merge-resolve: abort if index does not match HEAD

Elijah Newren committed about 4 years ago

merge-ort-wrappers: make printed message match the one from recursive

Elijah Newren committed about 4 years ago

builtin/cat-file.c: support NUL-delimited input with `-z`

Taylor Blau committed about 4 years ago

t1006: extract --batch-command inputs to variables

Taylor Blau committed about 4 years ago

The sixth batch

Junio C Hamano committed about 4 years ago

Merge branch 'rs/mingw-tighten-mkstemp'

Junio C Hamano committed about 4 years ago