Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6

Junio C Hamano committed over 10 years ago

Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5

Junio C Hamano committed over 10 years ago

list-objects: pass full pathname to callbacks

Jeff King committed over 10 years ago

list-objects: drop name_path entirely

Jeff King committed over 10 years ago

list-objects: convert name_path to a strbuf

Jeff King committed over 10 years ago

show_object_with_name: simplify by using path_name()

Jeff King committed over 10 years ago

add helpers for detecting size_t overflow

Jeff King committed over 10 years ago

http-push: stop using name_path

Jeff King committed over 10 years ago

tree-diff: catch integer overflow in combine_diff_path allocation

Jeff King committed over 10 years ago

clone tests: rename t57* => t56*

Stefan Beller committed over 10 years ago

Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git

Jiang Xin committed over 10 years ago

Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko

Jiang Xin committed over 10 years ago

Merge branch 'master' of git://github.com/nafmo/git-l10n-sv

Jiang Xin committed over 10 years ago

l10n: ko.po: Update Korean translation

Changwoo Ryu committed over 10 years ago

rerere: do use multiple variants

Junio C Hamano committed about 11 years ago

t4200: rerere a merge with two identical conflicts

Junio C Hamano committed over 11 years ago

rerere: allow multiple variants to exist

Junio C Hamano committed about 11 years ago

rerere: delay the recording of preimage

Junio C Hamano committed about 11 years ago

rerere: handle leftover rr-cache/$ID directory and postimage files

Junio C Hamano committed about 11 years ago

l10n: fr.po v2.8.0 round 3

Jean-Noel Avila committed over 10 years ago