t3205: finalize transitioning to using the branch name `main`

Johannes Schindelin committed over 5 years ago

t3203: complete the transition to using the branch name `main`

Johannes Schindelin committed over 5 years ago

t3201: finalize transitioning to using the branch name `main`

Johannes Schindelin committed over 5 years ago

t3200: finish transitioning to the initial branch name `main`

Johannes Schindelin committed over 5 years ago

t1400: use `main` as initial branch name

Johannes Schindelin committed over 5 years ago

diff: correct interaction between --exit-code and -I<pattern>

Junio C Hamano committed over 5 years ago

Merge branch 'fr_next' of github.com:jnavila/git into git-po-master

Jiang Xin committed over 5 years ago

Merge branch '2.30-rc1' of github.com:bitigchi/git-po

Jiang Xin committed over 5 years ago

l10n: fr.po: v2.30.0 rnd 1

Jean-Noël Avila committed over 5 years ago

l10n: fr.po Fix a typo

Baptiste Fontaine committed almost 6 years ago

l10n: fr fix misleading message

Jean-Noël Avila committed almost 6 years ago

t/perf: fix test_export() failure with BSD `sed`

Eric Sunshine committed over 5 years ago

l10n: tr: v2.30.0-r1

Emir Sarı committed over 5 years ago

pull: display default warning only when non-ff

Felipe Contreras committed over 5 years ago

pull: correct condition to trigger non-ff advice

Junio C Hamano committed over 5 years ago

pull: get rid of unnecessary global variable

Junio C Hamano committed over 5 years ago

merge-ort: add implementation of type-changed rename handling

Elijah Newren committed over 5 years ago

merge-ort: add implementation of normal rename handling

Elijah Newren committed over 5 years ago

merge-ort: add implementation of rename collisions

Elijah Newren committed over 5 years ago

merge-ort: add implementation of rename/delete conflicts

Elijah Newren committed over 5 years ago