Merge branch 'bc/sha-256-part-3'

Junio C Hamano committed about 6 years ago

t/t4013: add test for --diff-merges=off

Sergey Organov committed about 6 years ago

doc/git-log: describe --diff-merges=off

Sergey Organov committed about 6 years ago

revision: change "--diff-merges" option to require parameter

Sergey Organov committed about 6 years ago

t1416: avoid hard-coded sha1 ids

Jeff King committed about 6 years ago

multi-pack-index: repack batches below --batch-size

Derrick Stolee committed about 6 years ago

upload-pack: remove superfluous sigchain_pop() call

René Scharfe committed about 6 years ago

t6425: be more flexible with rename/delete conflict messages

Elijah Newren committed about 6 years ago

t642[23]: be more flexible for add/add conflicts involving pair renames

Elijah Newren committed about 6 years ago

t6422, t6426: be more flexible for add/add conflicts involving renames

Elijah Newren committed about 6 years ago

t6423: add an explanation about why one of the tests does not pass

Elijah Newren committed about 6 years ago

t6416, t6423: clarify some comments and fix some typos

Elijah Newren committed about 6 years ago

t6422: fix multiple errors with the mod6 test expectations

Elijah Newren committed about 6 years ago

t6423: fix test setup for a couple tests

Elijah Newren committed about 6 years ago

t6416, t6422: fix incorrect untracked file count

Elijah Newren committed about 6 years ago

t6422: fix bad check against missing file

Elijah Newren committed about 6 years ago

t6418: tighten delete/normalize conflict testcase

Elijah Newren committed about 6 years ago

Collect merge-related tests to t64xx

Elijah Newren committed about 6 years ago

progress: don't dereference before checking for NULL

Martin Ågren committed about 6 years ago

Fifth batch

Junio C Hamano committed about 6 years ago