merge-ort: add implementation of rename/delete conflicts
Elijah Newren committed almost 6 years ago
merge-ort: add implementation of both sides renaming differently
Elijah Newren committed almost 6 years ago
merge-ort: add implementation of both sides renaming identically
Elijah Newren committed almost 6 years ago
style: do not "break" in switch() after "return"
Ævar Arnfjörð Bjarmason committed almost 6 years ago
compat-util: pretend that stub setitimer() always succeeds
Junio C Hamano committed almost 6 years ago
strmap: make callers of strmap_remove() to call it in void context
Junio C Hamano committed almost 6 years ago
pack-redundant: gauge the usage before proposing its removal
Junio C Hamano committed about 6 years ago
l10n: sv.po: Update Swedish translation (5038t0f0u)
Peter Krefting committed almost 6 years ago
l10n: git.pot: v2.30.0 round 1 (70 new, 45 removed)
Jiang Xin committed almost 6 years ago
doc: mention Python 3.x supports
Đoàn Trần Công Danh committed almost 6 years ago
Junio C Hamano committed almost 6 years ago
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