Start post 2.11 cycle

Junio C Hamano committed almost 10 years ago

Sync with maint-2.10

Junio C Hamano committed almost 10 years ago

preparing for 2.10.3

Junio C Hamano committed almost 10 years ago

Merge branch 'jk/common-main' into maint-2.10

Junio C Hamano committed almost 10 years ago

convert: git cherry-pick -Xrenormalize did not work

Torsten Bögershausen committed almost 10 years ago

Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlf

Junio C Hamano committed almost 10 years ago

pull: fast-forward "pull --rebase=true"

Junio C Hamano committed over 10 years ago

submodule add: extend force flag to add existing repos

Stefan Beller committed almost 10 years ago

sequencer: use trailer's trailer layout

Jonathan Tan committed almost 10 years ago

trailer: have function to describe trailer layout

Jonathan Tan committed almost 10 years ago

trailer: avoid unnecessary splitting on lines

Jonathan Tan committed almost 10 years ago

commit: make ignore_non_trailer take buf/len

Jonathan Tan committed almost 10 years ago

trailer: be stricter in parsing separators

Jonathan Tan committed almost 10 years ago

Merge branch 'tk/diffcore-delta-remove-unused' into maint

Junio C Hamano committed almost 10 years ago

Merge branch 'jk/create-branch-remove-unused-param' into maint

Junio C Hamano committed almost 10 years ago

Merge branch 'nd/worktree-lock' into maint

Junio C Hamano committed almost 10 years ago

Merge branch 'ps/common-info-doc' into maint

Junio C Hamano committed almost 10 years ago

Merge branch 'rs/cocci' into maint

Junio C Hamano committed almost 10 years ago

Merge branch 'nd/test-helpers' into maint

Junio C Hamano committed almost 10 years ago

Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint

Junio C Hamano committed almost 10 years ago