userdiff: support new keywords in PHP hunk header

Kana Natsuno committed over 8 years ago

t4018: add missing test cases for PHP

Kana Natsuno committed over 8 years ago

t6036: add lots of detail for directory/file conflicts in recursive case

Elijah Newren committed over 8 years ago

builtin/config: work around an unsized array forward declaration

Beat Bolli committed over 8 years ago

git-rebase--preserve-merges: fix formatting of todo help message

Tobias Klauser committed over 8 years ago

t5500: prettify non-commit tag tests

Jeff King committed over 8 years ago

fast-import: do not call diff_delta() with empty buffer

Mike Hommey committed over 8 years ago

grep.c: extract show_line_header()

Taylor Blau committed over 8 years ago

fetch-pack: support negotiation tip whitelist

Jonathan Tan committed over 8 years ago

fetch-pack: write shallow, then check connectivity

Jonathan Tan committed over 8 years ago

ref-filter: avoid backend filtering with --ignore-case

Jeff King committed over 8 years ago

for-each-ref: consistently pass WM_IGNORECASE flag

Aleksandr Makarov committed over 8 years ago

t6300: add a test for --ignore-case

Jeff King committed over 8 years ago

t6042: add testcase covering long chains of rename conflicts

Elijah Newren committed over 8 years ago

t6042: add testcase covering rename/rename(2to1)/delete/delete conflict

Elijah Newren committed over 8 years ago

t6042: add testcase covering rename/add/delete conflict type

Elijah Newren committed over 8 years ago

t6036: add a failed conflict detection case with conflicting types

Elijah Newren committed over 8 years ago

t6036: add a failed conflict detection case with submodule add/add

Elijah Newren committed over 8 years ago

t6036: add a failed conflict detection case with submodule modify/modify

Elijah Newren committed over 8 years ago

t6036: add a failed conflict detection case with symlink add/add

Elijah Newren committed over 8 years ago