Alice T'Poteat
525d3b3531
diff: the pane notices a finished merge by itself, and stays quiet on an unusual branch name ( #98357 )
2026-09-30 15:36:31 -04:00
Alice T'Poteat
292c5b8971
diff: the pane reads every file's hunks with one git process, where it started one per file ( #98445 )
2026-09-30 15:36:22 -04:00
Alice T'Poteat
9778ad7c09
diff: the pane reads the diff again after a rebase that finished ( #98374 )
2026-09-30 15:35:43 -04:00
Alice T'Poteat
dec92bc87a
mods: revert two changes (agents-md truncated reads, diff forced colors) ( #98018 )
...
* Revert "agents-md: the truncated-read tests laid out as the formatter lays them"
* Revert "fix(agents-md): retain instructions after truncated reads"
* Revert "diff: the shared diff arguments' doc says what --no-color pins"
* Revert "fix(diff): preserve hunks when Git forces colored output"
2026-09-28 17:05:53 -07:00
7487
453620980b
fix(diff): preserve hunks when Git forces colored output
2026-09-24 11:16:25 -07:00
poteat
9d302a84de
Merge remote-tracking branch 'origin/main' into poteat/diff-parity-2
...
# Conflicts:
# mods/diff/hooks/register.ts
# mods/diff/hooks/views/detail/code-blocks-of/code-blocks-of.ts
# mods/diff/tests/fixtures/git-in.ts
# mods/diff/tests/fixtures/in-repository.ts
# mods/diff/tests/fixtures/index.ts
# mods/telemetry/tests/fixtures/index.ts
2026-09-13 19:55:26 -07:00
Alice T'Poteat
18be13be81
mods: the diff, sec-default and telemetry tests move next to the mods ( #93951 )
...
Squash merge of 4 commits
2026-09-13 18:50:58 -07:00
Alice T'Poteat