Merge branch 'js/t5526-with-no-particular-primary-branch-name'

Junio C Hamano committed almost 6 years ago

Merge branch 'js/cmake-extra-built-ins-fix'

Junio C Hamano committed almost 6 years ago

Merge branch 'da/vs-build-iconv-fix'

Junio C Hamano committed almost 6 years ago

Merge branch 'jk/multi-line-indent-style-fix'

Junio C Hamano committed almost 6 years ago

Merge branch 'jk/check-config-parsing-error-in-upload-pack'

Junio C Hamano committed almost 6 years ago

Merge branch 'ae/doc-reproducible-html'

Junio C Hamano committed almost 6 years ago

Merge branch 'so/glossary-branch-is-not-necessarily-active'

Junio C Hamano committed almost 6 years ago

Merge branch 'fc/atmark-in-refspec'

Junio C Hamano committed almost 6 years ago

Merge branch 'dd/help-autocorrect-never'

Junio C Hamano committed almost 6 years ago

diffcore-rename: accelerate rename_dst setup

Elijah Newren committed almost 6 years ago

diffcore-rename: simplify and accelerate register_rename_src()

Elijah Newren committed almost 6 years ago

t4058: explore duplicate tree entry handling in a bit more detail

Elijah Newren committed almost 6 years ago

t4058: add more tests and documentation for duplicate tree entry handling

Elijah Newren committed almost 6 years ago

diffcore-rename: reduce jumpiness in progress counters

Elijah Newren committed almost 6 years ago

diffcore-rename: simplify limit check

Elijah Newren committed almost 6 years ago

diffcore-rename: avoid usage of global in too_many_rename_candidates()

Elijah Newren committed almost 6 years ago

diffcore-rename: rename num_create to num_destinations

Elijah Newren committed almost 6 years ago

pull: give the advice for choosing rebase/merge much later

Felipe Contreras committed almost 6 years ago

pull: refactor fast-forward check

Felipe Contreras committed almost 6 years ago

merge-ort: add basic outline for process_renames()

Elijah Newren committed almost 6 years ago