Git partially staged changes - #46541

Merged

cole-miller merged 41 commits into

zed-industries:mainfrom

drbh:git-partially-staged-changes

Jul 7, 2026

Commits on Apr 27, 2026

feat: partially staged change multibufs
drbh
committed
888d763
fix: clean up unnecessary comments
drbh
committed
e73faeb
fix: avoid .gitignore change
drbh
committed
882d359
fix: align gitignore
drbh
committed
849142a
fix: add missing newline in gitignore
drbh
committed
263c628
feat: update for latest diff changes
drbh
committed
012639c
feat: refactor and split changes
drbh
committed
e0edd35
feat: simplify staged diff
drbh
committed
036c4b5
Merge upstream/main into git-partially-staged-changes

drbh
and
claude
committed
8baea76
fix: update tests
drbh
committed
ad67b3d
Merge remote-tracking branch 'upstream/main' into git-partially-staged-changes
drbh
committed
22b79f5

Commits on Apr 30, 2026

Merge branch 'main' into git-partially-staged-changes
drbh
authored
9825497

Commits on Jun 21, 2026

Merge remote-tracking branch 'origin/main' into git-partially-staged-changes
cole-miller
committed
2da0203

Commits on Jun 22, 2026

Add a fake file to the staged buffer
cole-miller
committed
c7b1267

Commits on Jun 26, 2026

WIP
cole-miller
committed
755ccd3
Merge remote-tracking branch 'origin/main' into git-partially-staged-changes
cole-miller
committed
92d86e4

Commits on Jun 27, 2026

UI
cole-miller
committed
6c1a41f

Commits on Jun 28, 2026

Support optimistic staging and unstaging
cole-miller
committed
cf6f8d5

Commits on Jun 29, 2026

Separate items
cole-miller
committed
1c830f8
Set language on index text when opening unstaged diff standalone
cole-miller
committed
73e5d81
Prune subscriptions more thoroughly
cole-miller
committed
513cfc9
Fix subscriptions
cole-miller
committed
c4270b3

Commits on Jun 30, 2026

Make unstaged diff its own item
cole-miller
committed
cf3d65e
Rename field
cole-miller
committed
e8147f6
WIP
cole-miller
committed
c9a5478

Commits on Jul 5, 2026

WIP
cole-miller
committed
ea276fc
Simplify project signatures
cole-miller
committed
966e03d
Clean up a bit
cole-miller
committed
c906332
Fix bugs
cole-miller
committed
4f6aa38
Fix LHS hunk controls in staged diff
cole-miller
committed
398e34f
Merge remote-tracking branch 'origin/main' into git-partially-staged-changes
cole-miller
committed
c2a0393
Add a new randomized test and fix bug
cole-miller
committed
46ffc87
Make the test harder
cole-miller
committed
f630963

Commits on Jul 6, 2026

Extend the stage all/unstage all optimism to the new diffs
cole-miller
committed
afcaa42

Commits on Jul 7, 2026

Centralize diff hunk rendering and actions
cole-miller
committed
76e05e9
Simplify index buffer handling
cole-miller
committed
809f38a
Replace swap with a migration
cole-miller
committed
adc9638
Simplify DiffMultibuffer
cole-miller
committed
9037a18
Remove commit button from unstaged toolbar
cole-miller
committed
d03e783
Merge origin/main
cole-miller
committed
74d9732
Fixes after merge
cole-miller
committed
5fa7d91