Merge branch 'js/t3920-shell-and-or-fix'

Junio C Hamano committed over 3 years ago

Merge branch 'jh/fsmonitor-darwin-modernize'

Junio C Hamano committed over 3 years ago

Merge branch 'ab/t4023-avoid-losing-exit-status-of-diff'

Junio C Hamano committed over 3 years ago

Merge branch 'ab/t7600-avoid-losing-exit-status-of-git'

Junio C Hamano committed over 3 years ago

Merge branch 'ab/t5314-avoid-losing-exit-status'

Junio C Hamano committed over 3 years ago

Merge branch 'jh/t7527-unflake-by-forcing-cookie'

Junio C Hamano committed over 3 years ago

Merge branch 'rs/plug-pattern-list-leak-in-lof'

Junio C Hamano committed over 3 years ago

Merge branch 'rs/t4205-do-not-exit-in-test-script'

Junio C Hamano committed over 3 years ago

tests: make 'test_oid' print trailing newline

SZEDER Gábor committed over 3 years ago

var: add GIT_SEQUENCE_EDITOR variable

Sean Allred committed over 3 years ago

submodule: accept -v for the update command

Sven Strickroth committed over 3 years ago

Makefile: use sha1collisiondetection by default on OSX and Darwin

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

ref-filter: convert email atom parser to use err_bad_arg()

Jeff King committed over 3 years ago

ref-filter: truncate atom names in error messages

Jeff King committed over 3 years ago

ref-filter: factor out "unrecognized %(foo) arg" errors

Jeff King committed over 3 years ago

ref-filter: factor out "%(foo) does not take arguments" errors

Jeff King committed over 3 years ago

ref-filter: reject arguments to %(HEAD)

Jeff King committed over 3 years ago

diff: fix regression with --stat and unmerged file

Peter Grayson committed over 3 years ago

git: remove duplicate includes

Seija Kijin committed over 3 years ago

fsmonitor: eliminate call to deprecated FSEventStream function

Jeff Hostetler committed over 3 years ago