Merge branch 'es/ignore-osascript-failure'

Johannes Sixt committed 10 months ago

Merge branch 'mr/sort-refs-by-type'

Johannes Sixt committed 10 months ago

xdiff: change type of xdfile_t.changed from char to bool

Ezekiel Newren committed 11 months ago

xdiff: add macros DISCARD(0), KEEP(1), INVESTIGATE(2) in xprepare.c

Ezekiel Newren committed 11 months ago

Documentation/git-merge-tree.adoc: clarify the --merge-base option

Elijah Newren committed 10 months ago

doc: add some missing technical documents

Ramsay Jones committed 10 months ago

make: delete REFTABLE_LIB, add reftable to LIB_OBJS

Ezekiel Newren committed 10 months ago

make: delete XDIFF_LIB, add xdiff to LIB_OBJS

Ezekiel Newren committed 10 months ago

The fourteenth batch

Junio C Hamano committed 10 months ago

Merge branch 'kh/you-still-use-whatchanged-fix'

Junio C Hamano committed 10 months ago

Merge branch 'ps/meson-build-docs'

Junio C Hamano committed 10 months ago

Merge branch 'ps/config-get-color-fixes'

Junio C Hamano committed 10 months ago

Merge branch 'cc/fast-import-strip-signed-commits'

Junio C Hamano committed 10 months ago

Merge branch 'ms/refs-optimize'

Junio C Hamano committed 10 months ago

Merge branch 'jt/odb-transaction'

Junio C Hamano committed 10 months ago

t8020: fix test failure due to indeterministic tag sorting

Patrick Steinhardt committed 10 months ago

gitlab-ci: upload Meson test logs as JUnit reports

Patrick Steinhardt committed 10 months ago

gitlab-ci: drop workaround for Python certificate store on Windows

Patrick Steinhardt committed 10 months ago

gitlab-ci: ignore failures to disable realtime monitoring

Patrick Steinhardt committed 10 months ago

gitlab-ci: dedup instructions to disable realtime monitoring

Patrick Steinhardt committed 10 months ago