@matheusbsbs / matheus-bagliano
Fork 0
Code Commits 81,841 Issues Pulls Cloud Agent CICD
master
bisect jch maint master next seen test todo

t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify

Elijah Newren committed about 15 years ago

0b35deb378

t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify

Elijah Newren committed about 15 years ago

a0d3311624

t6036: tests for criss-cross merges with various directory/file conflicts

Elijah Newren committed about 15 years ago

827f2b7d29

t6036: criss-cross with weird content can fool git into clean merge

Elijah Newren committed about 15 years ago

96b079e5c9

t6036: Add differently resolved modify/delete conflict in criss-cross test

Elijah Newren committed about 15 years ago

fe7e9c23e4

t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts

Elijah Newren committed about 15 years ago

c6966068fb

t6042: Ensure rename/rename conflicts leave index and workdir in sane state

Elijah Newren committed about 15 years ago

f0b75fcc81

t6042: Add tests for content issues with modify/rename/directory conflicts

Elijah Newren committed about 15 years ago

ac6e839241

t6042: Add a testcase where undetected rename causes silent file deletion

Elijah Newren committed about 15 years ago

a0551f212e

t6042: Add a pair of cases where undetected renames cause issues

Elijah Newren committed about 15 years ago

7b4ed5941c

t6042: Add failing testcase for rename/modify/add-source conflict

Elijah Newren committed about 15 years ago

58040239f5

t6042: Add a testcase where git deletes an untracked file

Elijah Newren committed about 15 years ago

695576fddd

ls-files: fix pathspec display on error

Clemens Buchacher committed over 15 years ago

0f64bfa956

describe: Refresh the index when run with --dirty

Allan Caffee committed over 15 years ago

bb571486ae

test: consolidate definition of $LF

Junio C Hamano committed over 15 years ago

3f4ab62714

Tolerate zlib deflation with window size < 32Kb

Roberto Tyley committed over 15 years ago

7f684a2aff

am: ignore leading whitespace before patch

David Barr committed over 15 years ago

0e8341f29d

add update 'none' flag to disable update of submodule by default

Heiko Voigt committed about 15 years ago

322bb6e12f

submodule: move update configuration variable further up

Heiko Voigt committed about 15 years ago

817bac35f2

fsck: improve committer/author check

Dmitry Ivankov committed about 15 years ago

53f53cff24
← Newer Page 2774 of 4093 Older →