Merge branch 'ps/abbrev-length-before-setup-fix'

Junio C Hamano committed about 2 years ago

Merge branch 'rj/format-patch-auto-cover-with-interdiff'

Junio C Hamano committed about 2 years ago

Merge branch 'kn/update-ref-symref'

Junio C Hamano committed about 2 years ago

Merge branch 'gt/unit-test-oidtree'

Junio C Hamano committed about 2 years ago

Merge branch 'tb/multi-pack-reuse-fix'

Junio C Hamano committed about 2 years ago

Merge branch 'ps/make-append-to-cflags'

Junio C Hamano committed about 2 years ago

Merge branch 'rs/diff-exit-code-with-external-diff'

Junio C Hamano committed about 2 years ago

Merge branch 'ds/doc-add-interactive-singlekey'

Junio C Hamano committed about 2 years ago

version: --build-options reports OpenSSL version information

Randall S. Becker committed about 2 years ago

commit: remove find_header_mem()

René Scharfe committed about 2 years ago

t5500: fix mistaken $SERVER reference in helper function

Jeff King committed about 2 years ago

mingw: drop bogus (and unneeded) declaration of `_pgmptr`

Johannes Schindelin committed about 2 years ago

fetch-pack: fix segfault when fscking without --lock-pack

Jeff King committed about 2 years ago

merge-ort: convert more error() cases to path_msg()

Elijah Newren committed about 2 years ago

merge-ort: upon merge abort, only show messages causing the abort

Elijah Newren committed about 2 years ago

merge-ort: loosen commented requirements

Elijah Newren committed about 2 years ago

merge-ort: clearer propagation of failure-to-function from merge_submodule

Elijah Newren committed about 2 years ago

merge-ort: fix type of local 'clean' var in handle_content_merge ()

Elijah Newren committed about 2 years ago

merge-ort: maintain expected invariant for priv member

Elijah Newren committed about 2 years ago

merge-ort: extract handling of priv member into reusable function

Elijah Newren committed about 2 years ago