merge-recursive: switch from (oid,mode) pairs to a diff_filespec

Elijah Newren committed over 7 years ago

merge-recursive: cleanup handle_rename_* function signatures

Elijah Newren committed over 7 years ago

merge-recursive: track branch where rename occurred in rename struct

Elijah Newren committed over 7 years ago

merge-recursive: remove ren[12]_other fields from rename_conflict_info

Elijah Newren committed over 7 years ago

merge-recursive: shrink rename_conflict_info

Elijah Newren committed over 7 years ago

merge-recursive: move some struct declarations together

Elijah Newren committed over 7 years ago

merge-recursive: use 'ci' for rename_conflict_info variable name

Elijah Newren committed over 7 years ago

merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'

Elijah Newren committed over 7 years ago

merge-recursive: rename diff_filespec 'one' to 'o'

Elijah Newren committed over 7 years ago

merge-recursive: rename merge_options argument from 'o' to 'opt'

Elijah Newren committed over 7 years ago

Use 'unsigned short' for mode, like diff_filespec does

Elijah Newren committed over 7 years ago

diff: batch fetching of missing blobs

Jonathan Tan committed over 7 years ago

t: move 'hex2oct' into test-lib-functions.sh

Taylor Blau committed over 7 years ago

progress: assemble percentage and counters in a strbuf before printing

SZEDER Gábor committed over 7 years ago

progress: make display_progress() return void

SZEDER Gábor committed over 7 years ago

tag: fix formatting

Denton Liu committed over 7 years ago

ci: fix AsciiDoc/Asciidoctor stderr check in the documentation build job

SZEDER Gábor committed over 7 years ago

ci: stick with Asciidoctor v1.5.8 for now

SZEDER Gábor committed over 7 years ago

send-email: don't cc *-by lines with '-' prefix

Baruch Siach committed over 7 years ago

cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR

Denton Liu committed over 7 years ago