Merge branch 'jc/t6424-failing-merge-preserve-local-changes'

Junio C Hamano committed about 4 years ago

Merge branch 'cc/http-curlopt-resolve'

Junio C Hamano committed about 4 years ago

scalar: teach `diagnose` to gather loose objects information

Matthew John Cheetham committed about 4 years ago

scalar: teach `diagnose` to gather packfile info

Matthew John Cheetham committed about 4 years ago

scalar diagnose: include disk space information

Johannes Schindelin committed about 4 years ago

scalar: implement `scalar diagnose`

Johannes Schindelin committed about 4 years ago

scalar: validate the optional enlistment argument

Johannes Schindelin committed about 4 years ago

archive --add-virtual-file: allow paths containing colons

Johannes Schindelin committed about 4 years ago

archive: optionally add "virtual" files

Johannes Schindelin committed about 4 years ago

pathspec: correct an empty string used as a pathspec element

Junio C Hamano committed about 4 years ago

Merge branch 'rs/document-archive-prefix' into js/scalar-diagnose

Junio C Hamano committed about 4 years ago

archive: improve documentation of --prefix

René Scharfe committed about 4 years ago

http.c: clear the 'finished' member once we are done with it

Junio C Hamano committed over 4 years ago

transport: free local and remote refs in transport_push()

Frantisek Hrbata committed over 4 years ago

transport: unify return values and exit point from transport_push()

Frantisek Hrbata committed over 4 years ago

transport: remove unnecessary indenting in transport_push()

Frantisek Hrbata committed over 4 years ago

revert: optionally refer to commit in the "reference" format

Junio C Hamano committed about 4 years ago

t7527: improve implicit shutdown testing in fsmonitor--daemon

Jeff Hostetler committed over 4 years ago

fsmonitor--daemon: allow --super-prefix argument

Jeff Hostetler committed over 4 years ago

t7527: test Unicode NFC/NFD handling on MacOS

Jeff Hostetler committed over 4 years ago