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

merge-ort: add implementation of both sides renaming differently

Elijah Newren committed over 5 years ago

merge-ort: add implementation of both sides renaming identically

Elijah Newren committed over 5 years ago

style: do not "break" in switch() after "return"

Ævar Arnfjörð Bjarmason committed over 5 years ago

compat-util: pretend that stub setitimer() always succeeds

Junio C Hamano committed over 5 years ago

strmap: make callers of strmap_remove() to call it in void context

Junio C Hamano committed over 5 years ago

pack-redundant: gauge the usage before proposing its removal

Junio C Hamano committed about 6 years ago