Merge branch 'en/ort-conflict-handling'

Junio C Hamano committed over 5 years ago

Merge branch 'so/log-diff-merge'

Junio C Hamano committed over 5 years ago

Prepare for 2.30.1

Junio C Hamano committed over 5 years ago

Merge branch 'js/skip-dashed-built-ins-from-config-mak' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'jt/packfile-as-uri-doc' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'ab/fsck-doc-fix' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'jk/log-cherry-pick-duplicate-patches' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'jk/forbid-lf-in-git-url' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'jc/macos-install-dependencies-fix' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'tb/local-clone-race-doc' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'bc/doc-status-short' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'ab/gettext-charset-comment-fix' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'ug/doc-lose-dircache' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'ad/t4129-setfacl-target-fix' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'jk/t5516-deflake' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'vv/send-email-with-less-secure-apps-access' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'pb/mergetool-tool-help-fix' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'ds/for-each-repo-noopfix' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'jc/sign-off' into maint

Junio C Hamano committed over 5 years ago

Merge branch 'mt/t4129-with-setgid-dir' into maint

Junio C Hamano committed over 5 years ago