archive-tar: use size_t in strbuf_append_ext_header()
René Scharfe committed about 7 years ago
archive-tar: fix pax extended header length calculation
René Scharfe committed about 7 years ago
archive-tar: report wrong pax extended header length
René Scharfe committed about 7 years ago
merge-recursive: alphabetize include list
Elijah Newren committed about 7 years ago
merge-recursive: add sanity checks for relevant merge_options
Elijah Newren committed about 7 years ago
merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
Elijah Newren committed about 7 years ago
merge-recursive: split internal fields into a separate struct
Elijah Newren committed about 7 years ago
merge-recursive: avoid losing output and leaking memory holding that output
Elijah Newren committed about 7 years ago
merge-recursive: comment and reorder the merge_options fields
Elijah Newren committed about 7 years ago
merge-recursive: consolidate unnecessary fields in merge_options
Elijah Newren committed about 7 years ago
merge-recursive: move some definitions around to clean up the header
Elijah Newren committed about 7 years ago
merge-recursive: rename merge_options argument to opt in header
Elijah Newren committed about 7 years ago
merge-recursive: rename 'mrtree' to 'result_tree', for clarity
Elijah Newren committed about 7 years ago
merge-recursive: use common name for ancestors/common/base_list
Elijah Newren committed about 7 years ago
merge-recursive: fix some overly long lines
Elijah Newren committed about 7 years ago
cache-tree: share code between functions writing an index as a tree
Elijah Newren committed about 7 years ago
merge-recursive: don't force external callers to do our logging
Elijah Newren committed about 7 years ago
merge-recursive: remove useless parameter in merge_trees()
Elijah Newren committed about 7 years ago
merge-recursive: exit early if index != head
Elijah Newren committed about 7 years ago
Ensure index matches head before invoking merge machinery, round N
Elijah Newren committed about 7 years ago