submodule merge: update conflict error message

Calvin Wan committed about 4 years ago

tests: cache glibc version check

Phillip Wood committed about 4 years ago

doc: clarify rerere-autoupdate

Junio C Hamano committed about 4 years ago

doc: consolidate --rerere-autoupdate description

Junio C Hamano committed about 4 years ago

The ninth batch

Junio C Hamano committed about 4 years ago

Merge branch 'jc/string-list-cleanup'

Junio C Hamano committed about 4 years ago

Merge branch 'en/merge-restore-to-pristine'

Junio C Hamano committed about 4 years ago

Merge branch 'rs/mergesort'

Junio C Hamano committed about 4 years ago

Merge branch 'sa/cat-file-mailmap'

Junio C Hamano committed about 4 years ago

Merge branch 'zh/ls-files-format'

Junio C Hamano committed about 4 years ago

Merge branch 'tb/commit-graph-genv2-upgrade-fix'

Junio C Hamano committed about 4 years ago

Merge branch 'tk/untracked-cache-with-uall'

Junio C Hamano committed about 4 years ago

Merge branch 'pw/xdiff-alloc'

Junio C Hamano committed about 4 years ago

Merge branch 'ds/midx-with-less-memory'

Junio C Hamano committed about 4 years ago

revisions API: don't leak memory on argv elements that need free()-ing

Ævar Arnfjörð Bjarmason committed about 4 years ago

bisect.c: partially fix bisect_rev_setup() memory leak

Ævar Arnfjörð Bjarmason committed about 4 years ago

log: refactor "rev.pending" code in cmd_show()

Ævar Arnfjörð Bjarmason committed about 4 years ago

log: fix a memory leak in "git show <revision>..."

Ævar Arnfjörð Bjarmason committed about 4 years ago

test-fast-rebase helper: use release_revisions() (again)

Ævar Arnfjörð Bjarmason committed about 4 years ago

bisect.c: add missing "goto" for release_revisions()

Ævar Arnfjörð Bjarmason committed about 4 years ago