Merge branch 'en/merge-ort-2'

Junio C Hamano committed over 5 years ago

Merge branch 'en/merge-ort-impl'

Junio C Hamano committed over 5 years ago

Merge branch 'tb/pack-bitmap'

Junio C Hamano committed over 5 years ago

Merge branch 'ab/trailers-extra-format'

Junio C Hamano committed over 5 years ago

Merge branch 'pk/subsub-fetch-fix-take-2'

Junio C Hamano committed over 5 years ago

git: add `--super-prefix` to usage string

Patrick Steinhardt committed over 5 years ago

mergetool--lib: fix '--tool-help' to correctly show available tools

Philippe Blain committed over 5 years ago

t4129: don't fail if setgid is set in the test directory

Matheus Tavares committed over 5 years ago

branch tests: add to --sort tests

Ævar Arnfjörð Bjarmason committed over 5 years ago

branch: change "--local" to "--list" in comment

Ævar Arnfjörð Bjarmason committed over 5 years ago

builtin/*: update usage format

ZheNing Hu committed over 5 years ago

parse-options: format argh like error messages

Junio C Hamano committed over 5 years ago

mktag: add a --[no-]strict option

Ævar Arnfjörð Bjarmason committed over 5 years ago

read-cache: try not to peek into `struct {lock_,temp}file`

Martin Ågren committed over 5 years ago

refs/files-backend: don't peek into `struct lock_file`

Martin Ågren committed over 5 years ago

midx: don't peek into `struct lock_file`

Martin Ågren committed over 5 years ago

commit-graph: don't peek into `struct lock_file`

Martin Ågren committed over 5 years ago

builtin/gc: don't peek into `struct lock_file`

Martin Ågren committed over 5 years ago

p7519: allow running without watchman prereq

Taylor Blau committed over 5 years ago

mktag: mark strings for translation

Ævar Arnfjörð Bjarmason committed over 5 years ago