Commit Graph
100 Commits
Author SHA1 Message Date
Taiga 4bcd09872e [2026-09-02 12:17:20] taiga-vault: resolve old committed merge-conflict markers (htpc-emulators-setup, switch-emulation-rom-infra, from 2026-06-18); add incident note 2026-09-02 12:17:20 +00:00
Taiga 5bdd673b8f [2026-09-02 12:15:26] taiga-vault: resolve merge conflict in truenas note — take origin/main lineage (newer through 2026-08-24); local 08-17 state was superseded 2026-09-02 12:15:26 +00:00
Taiga d5ede3f69c [2026-09-02 12:14:08] taiga-vault: merge conflict — committed markers 2026-09-02 12:14:08 +00:00
Taiga 811f807ed7 [2026-09-02 12:13:00] taiga-vault: family/how-to/truenas-sata-ports-and-zfs-pools.md 2026-09-02 12:13:01 +00:00
Taiga ceea8484d9 Merge remote-tracking branch 'origin/main' 2026-08-01 02:10:55 +00:00
Taiga 96f886be8e [2026-08-01 02:10:52] taiga-vault: family/how-to/truenas-sata-ports-and-zfs-pools.md 2026-08-01 02:10:53 +00:00
Taiga b91e256aa5 Merge remote-tracking branch 'origin/main' 2026-07-31 06:33:00 +00:00
Taiga fe2c366488 [2026-07-31 06:32:54] taiga-vault: family/how-to/truenas-access.md family/how-to/truenas-sata-ports-and-zfs-pools.md 2026-07-31 06:32:57 +00:00
Taiga 888cecc955 [2026-07-23 11:00] housekeeping: stop tracking .stversions/ files (already gitignored) 2026-07-23 11:08:56 +00:00
Taiga 388c903f8e Merge remote-tracking branch 'origin/main' 2026-07-23 05:11:42 +00:00
Taiga fee2e0cd64 [2026-07-23 05:11:39] taiga-vault: family/documents/fasteners-nomenclature.md 2026-07-23 05:11:42 +00:00
Taiga ab69d0810b Merge remote-tracking branch 'origin/main' 2026-07-23 04:45:17 +00:00
Taiga eb109d6038 [2026-07-23 04:45:17] taiga-vault: family/documents/fasteners-nomenclature.md 2026-07-23 04:45:17 +00:00
Taiga 572eaa9fd6 Merge remote-tracking branch 'origin/main' 2026-07-23 04:40:58 +00:00
Taiga 4132798f6b [2026-07-23 04:40:57] taiga-vault: family/documents/fasteners-nomenclature.md 2026-07-23 04:40:58 +00:00
Taiga fad4a189f2 Merge remote-tracking branch 'origin/main' 2026-07-23 04:35:37 +00:00
Taiga 3f1508798a [2026-07-23 04:31:43] taiga-vault: family/documents/bring-to-russia.md family/documents/fasteners-nomenclature.md family/how-to/rasputin-router.md 2026-07-23 04:31:45 +00:00
Taiga a174f0c56c Merge remote-tracking branch 'origin/main' 2026-07-16 13:55:54 +00:00
Taiga a75fe37e9f [2026-07-16 13:55:52] taiga-vault: family/documents/fasteners-nomenclature.md 2026-07-16 13:55:52 +00:00
Taiga bc4ebe3a4e Merge remote-tracking branch 'origin/main' 2026-07-16 09:55:35 +00:00
Taiga 76fe36f050 [2026-07-16 09:55:35] taiga-vault: family/documents/fasteners-nomenclature.md 2026-07-16 09:55:35 +00:00
Taiga 0f23da1f85 Merge remote-tracking branch 'origin/main' 2026-07-16 06:06:33 +00:00
Taiga 9fce0888ca [2026-07-16 06:06:32] taiga-vault: personal/tech/original-xbox-2025-guide.md 2026-07-16 06:06:32 +00:00
Taiga a5427f83e9 Merge remote-tracking branch 'origin/main' 2026-07-15 11:35:18 +00:00
Taiga bbf9fe6a3d [2026-07-15 11:35:17] taiga-vault: family/documents/fasteners-nomenclature.md personal/plans/fasteners-stickers.md 2026-07-15 11:35:17 +00:00
Taiga 6d7cea4922 Merge remote-tracking branch 'origin/main' 2026-07-15 10:45:52 +00:00
Taiga 68d787eefb [2026-07-15 10:45:52] taiga-vault: personal/plans/fasteners-stickers.md 2026-07-15 10:45:52 +00:00
Taiga 9e581b5508 Merge remote-tracking branch 'origin/main' 2026-07-15 10:40:33 +00:00
Taiga 7e8d9d7ad5 [2026-07-15 10:40:32] taiga-vault: family/documents/fasteners-nomenclature.md personal/plans/fasteners-stickers.md 2026-07-15 10:40:32 +00:00
Taiga d73c6e44ea Merge remote-tracking branch 'origin/main' 2026-07-15 10:25:51 +00:00
Taiga 1f8602f225 [2026-07-15 10:25:51] taiga-vault: family/documents/fasteners-nomenclature.md personal/plans/fasteners-stickers.md 2026-07-15 10:25:51 +00:00
Taiga 80fb057534 Merge remote-tracking branch 'origin/main' 2026-07-15 10:22:36 +00:00
Taiga a153caee6f [2026-07-15 10:22:34] taiga-vault: family/documents/fasteners-nomenclature.md personal/plans/fasteners-stickers.md personal/tech/hermes-browser-toolsets.md 2026-07-15 10:22:35 +00:00
Taiga ae5135d78e Merge remote-tracking branch 'origin/main' 2026-07-15 10:15:22 +00:00
Taiga b4cc86e6bd [2026-07-15 10:15:21] taiga-vault: family/documents/fasteners-nomenclature.md personal/plans/fasteners-stickers.md 2026-07-15 10:15:22 +00:00
Taiga ef5b8e9843 Merge remote-tracking branch 'origin/main' 2026-07-15 07:45:44 +00:00
Taiga 720460a7b7 [2026-07-15 07:45:42] taiga-vault: family/documents/fasteners-nomenclature.md 2026-07-15 07:45:43 +00:00
Taiga 27c5ca7902 Merge remote-tracking branch 'origin/main' 2026-07-15 03:40:27 +00:00
Taiga dd95907053 [2026-07-15 03:40:23] taiga-vault: family/documents/fasteners-nomenclature.md personal/plans/fasteners-stickers.md 2026-07-15 03:40:26 +00:00
Taiga af442e2c75 Merge remote-tracking branch 'origin/main' 2026-07-15 03:03:25 +00:00
Taiga 2df0dc6278 [2026-07-15 03:03:18] taiga-vault: family/documents/fasteners-nomenclature.md personal/plans/fasteners-stickers.md 2026-07-15 03:03:22 +00:00
Taiga a78796e48c Merge remote-tracking branch 'origin/main' 2026-07-10 06:02:56 +00:00
Taiga b457b682bc [2026-07-10 06:02:51] taiga-vault: personal/bring-to-bishkek.md 2026-07-10 06:02:53 +00:00
Taiga c647878fe6 [2026-07-09 02:32:27] taiga-vault: family/documents/vault-sync/2026-07-09.md 2026-07-09 02:32:27 +00:00
Taiga 99043635ee [2026-07-09 02:21] ignore: .DS_Store and .stversions/ 2026-07-09 02:26:52 +00:00
Taiga c5283698b9 [2026-07-08 22:20:23] taiga-vault: family/documents/vault-sync/2026-07-08.md 2026-07-08 22:20:24 +00:00
Taiga 00c0665483 [2026-07-06] taiga-vault: family/documents/vault-sync/2026-07-06.md 2026-07-06 20:31:30 +00:00
Taiga 413d4649d4 [2026-07-06] taiga-vault: family/documents/vault-sync/2026-07-06.md 2026-07-06 17:55:57 +00:00
Taiga e6bc1ba5a7 [2026-07-06] taiga-vault: family/documents/vault-sync/2026-07-06.md 2026-07-06 14:55:38 +00:00
Taiga 149d48155f Merge remote-tracking branch 'origin/main' 2026-07-06 14:11:22 +00:00
Taiga eb73b727d5 [2026-07-06] taiga-vault: family/how-to/switch-emulation-rom-infra.md personal/tech/ryujinx-mac-setup.md 2026-07-06 14:11:22 +00:00
Taiga 2851683b11 Merge remote-tracking branch 'origin/main' 2026-07-06 13:55:40 +00:00
Taiga b2e2d88ad9 [2026-07-06] taiga-vault: family/.DS_Store 2026-07-06 13:55:40 +00:00
Taiga 639c364711 Merge remote-tracking branch 'origin/main' 2026-07-06 13:21:09 +00:00
Taiga 6d78a1378b [2026-07-06] taiga-vault: family/.DS_Store 2026-07-06 13:21:08 +00:00
Taiga 306f4c35bb Merge remote-tracking branch 'origin/main' 2026-07-06 12:20:39 +00:00
Taiga cb0b61e70c [2026-07-06] taiga-vault: family/how-to/truenas-infrastructure.md 2026-07-06 12:20:39 +00:00
Taiga 3eb930bd9a Merge remote-tracking branch 'origin/main' 2026-07-06 12:09:24 +00:00
Taiga f6381fd117 [2026-07-06] taiga-vault: family/how-to/truenas-infrastructure.md 2026-07-06 12:09:23 +00:00
Taiga 1eabab8a4c Merge remote-tracking branch 'origin/main' 2026-07-06 11:55:14 +00:00
Taiga 75b2d72405 [2026-07-06] taiga-vault: family/how-to/truenas-infrastructure.md 2026-07-06 11:55:14 +00:00
Taiga ad632693bb Merge remote-tracking branch 'origin/main' 2026-07-06 11:50:54 +00:00
Taiga 9fa5e19d3b [2026-07-06] taiga-vault: family/how-to/truenas-infrastructure.md 2026-07-06 11:50:53 +00:00
Taiga c2d07a53f3 Merge remote-tracking branch 'origin/main' 2026-07-06 11:45:22 +00:00
Taiga 9495ce9537 [2026-07-06] taiga-vault: family/.DS_Store 2026-07-06 11:45:21 +00:00
Taiga 07023e4803 [2026-07-06] taiga-vault: family/documents/vault-sync/2026-07-06.md 2026-07-06 10:30:36 +00:00
Taiga 74c4008034 [2026-07-06] taiga-vault: family/how-to/truenas-sata-ports-and-zfs-pools.md 2026-07-06 06:31:41 +00:00
Taiga 846e989ce9 [2026-07-05] taiga-vault: family/documents/vault-sync/2026-07-05.md 2026-07-05 15:25:31 +00:00
Taiga 7733710d34 [2026-07-05] taiga-vault: family/documents/vault-sync/2026-07-05.md 2026-07-05 12:25:41 +00:00
Taiga 8f62bfba8c [2026-07-05] taiga-vault: family/documents/vault-sync/2026-07-05.md 2026-07-05 06:46:13 +00:00
Taiga 5aa0c48c70 [2026-07-04] taiga-vault: family/how-to/home-automation.md 2026-07-04 16:46:08 +00:00
Taiga 1e211d7361 [2026-07-04] taiga-vault: family/documents/vault-sync/2026-07-04.md 2026-07-04 13:10:55 +00:00
Taiga 37a6c27183 Merge remote-tracking branch 'origin/main' 2026-07-04 04:10:56 +00:00
Taiga 600ccd88bf [2026-07-04] taiga-vault: family/documents/vault-sync/2026-07-04.md 2026-07-04 04:10:54 +00:00
Taiga 8a51e86697 [2026-07-03] taiga-vault: family/documents/vault-sync/2026-07-03.md 2026-07-03 18:36:01 +00:00
Taiga 5c5d9155e3 Merge remote-tracking branch 'origin/main' 2026-07-03 17:03:42 +00:00
Taiga 737418f0fe [2026-07-03] taiga-vault: family/how-to/htpc-system.md family/how-to/openmediavault-rpi5.md 2026-07-03 17:03:41 +00:00
Taiga 1722c75f90 Merge remote-tracking branch 'origin/main' 2026-07-03 16:55:47 +00:00
Taiga 8466185d57 [2026-07-03] taiga-vault: family/how-to/openmediavault-rpi5.md 2026-07-03 16:55:47 +00:00
Taiga 0bef61db8a Merge remote-tracking branch 'origin/main' 2026-07-03 16:51:03 +00:00
Taiga d537a9c272 [2026-07-03] taiga-vault: family/how-to/htpc-system.md family/how-to/openmediavault-rpi5.md 2026-07-03 16:51:02 +00:00
Taiga e1e2ed71ed Merge remote-tracking branch 'origin/main' 2026-07-03 16:35:33 +00:00
Taiga 92ebf370b4 [2026-07-03] taiga-vault: family/how-to/htpc-system.md 2026-07-03 16:35:31 +00:00
Taiga 124692f406 Merge remote-tracking branch 'origin/main' 2026-07-03 14:35:51 +00:00
Taiga 6c7993d1ff [2026-07-03] taiga-vault: family/how-to/htpc-system.md family/projects/media-toolbox-kraken.md 2026-07-03 14:35:50 +00:00
Taiga 461e6ff4dd Merge remote-tracking branch 'origin/main' 2026-07-03 12:20:30 +00:00
Taiga 3c25074e62 [2026-07-03] taiga-vault: family/how-to/htpc-system.md family/projects/media-toolbox-kraken.md 2026-07-03 12:20:29 +00:00
Taiga 918d632f83 [2026-07-03] taiga-vault: family/documents/vault-sync/2026-07-03.md 2026-07-03 09:25:16 +00:00
Taiga 1ee68e411b [2026-07-03] taiga-vault: family/documents/vault-sync/2026-07-03.md 2026-07-03 09:06:50 +00:00
Taiga 05a36dbe38 Merge remote-tracking branch 'origin/main' 2026-07-03 08:34:08 +00:00
Taiga 44a6c157d2 [2026-07-03] taiga-vault: family/how-to/htpc-system.md family/projects/media-toolbox-kraken.md 2026-07-03 08:34:08 +00:00
Taiga 826e48ffba Merge remote-tracking branch 'origin/main' 2026-07-03 08:25:45 +00:00
Taiga 195b476404 [2026-07-03] taiga-vault: family/how-to/htpc-system.md 2026-07-03 08:25:44 +00:00
Taiga 76f0f4958d Merge remote-tracking branch 'origin/main' 2026-07-03 08:16:04 +00:00
Taiga a5d697a56c [2026-07-03] taiga-vault: family/how-to/htpc-system.md family/how-to/openmediavault-rpi5.md 2026-07-03 08:16:03 +00:00
Taiga 5491644679 Merge remote-tracking branch 'origin/main' 2026-07-03 08:13:32 +00:00
Taiga 4ab2c67d81 [2026-07-03] taiga-vault: family/how-to/htpc.md 2026-07-03 08:13:31 +00:00
Taiga d6430d5615 Merge remote-tracking branch 'origin/main' 2026-07-03 07:33:21 +00:00
Taiga 046f2eed51 [2026-07-03] taiga-vault: family/projects/media-toolbox-kraken.md 2026-07-03 07:33:19 +00:00
Taiga b816326ee7 Merge remote-tracking branch 'origin/main' 2026-07-03 07:10:32 +00:00