Overview
| Comment: | stash: snapshot, diff, goto, and apply --merge (zit#164)
--merge three-way merges a stashed change into a dirty file; conflicts get markers, are listed, and exit 5 with the entry kept. |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
21ce2c785d1da8e9cea653b8baac7c77 |
| User & Date: | dmestas on 2026-08-29 07:53:00.918 |
| Other Links: | manifest | tags |
Context
|
2026-08-29
| ||
| 08:46 |
settings editor and autosync pullonly, --changed/--value; grep -i -c -l -v --once; annotate -n -l (zit#164)
The two new settings ride the keyed config block; a configured editor makes commit editor-capable without a terminal. check-in: 7d9dcb2de1 user: dmestas tags: trunk | |
| 07:53 |
stash: snapshot, diff, goto, and apply --merge (zit#164)
--merge three-way merges a stashed change into a dirty file; conflicts get markers, are listed, and exit 5 with the entry kept. check-in: 21ce2c785d user: dmestas tags: trunk | |
| 07:35 |
merge: --integrate, --baseline, -n, and a bare merge onto the one other leaf (zit#164)
The checkout record carries the integrated leaf's hash as an optional sixth field; commit closes it with the same control artifact branch close mints. check-in: 2a522aab40 user: dmestas tags: trunk | |
Changes
Modified src/cmd/stash.zig
from [9e4dc24dd9]
to [3884807399].
[diff]
Modified src/cmd/tracking.zig
from [61a2966fec]
to [14c7e6fc25].
[diff]
Modified src/e2e.zig
from [2c8fc6d917]
to [563f2c5af3].
[diff]
Modified src/main.zig
from [d709cd84ae]
to [58c88b30f4].
[diff]
Modified www/reference.html
from [6e17adf807]
to [cb6177c4fb].
[diff]