merge-recursive: improve rename/rename(1to2)/add[/add] handling

Elijah Newren committed almost 8 years ago

merge-recursive: use handle_file_collision for add/add conflicts

Elijah Newren committed almost 8 years ago

merge-recursive: improve handling for rename/rename(2to1) conflicts

Elijah Newren committed almost 8 years ago

merge-recursive: fix rename/add conflict handling

Elijah Newren committed almost 8 years ago

merge-recursive: new function for better colliding conflict resolutions

Elijah Newren committed almost 8 years ago

merge-recursive: increase marker length with depth of recursion

Elijah Newren committed almost 8 years ago

t6036, t6042: testcases for rename collision of already conflicting files

Elijah Newren committed almost 8 years ago

t6042: add tests for consistency in file collision conflict handling

Elijah Newren committed almost 8 years ago

built-in rebase --autostash: leave the current branch alone if possible

Johannes Schindelin committed almost 8 years ago

built-in rebase: demonstrate regression with --autostash

Johannes Schindelin committed almost 8 years ago

Windows: force-recompile git.res for differing architectures

Johannes Schindelin committed almost 8 years ago

approxidate: fix NULL dereference in date_time()

Jeff King committed almost 8 years ago

pack-objects: ignore ambiguous object warnings

Derrick Stolee committed almost 8 years ago

pull: handle --verify-signatures for unborn branch

Jeff King committed almost 8 years ago

merge: handle --verify-signatures for unborn branch

Jeff King committed almost 8 years ago

merge: extract verify_merge_signature() helper

Jeff King committed almost 8 years ago

Ninth batch for 2.20

Junio C Hamano committed almost 8 years ago

Merge branch 'sg/test-verbose-log'

Junio C Hamano committed almost 8 years ago

Merge branch 'rj/header-cleanup'

Junio C Hamano committed almost 8 years ago

Merge branch 'ss/travis-ci-force-vm-mode'

Junio C Hamano committed almost 8 years ago