unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-11 02:25:39 +03:00
Code Issues Projects Releases Wiki Activity
17,084 Commits 413 Branches 90 Tags 321 MiB
trunk
Commit Graph

24 Commits

Author SHA1 Message Date
Mitchell Rosen
7506ae26b6 get transcripts passing 2024-07-23 13:45:16 -04:00
Chris Penner
1e4f1abe73 Fix diff-helper to use the names from both branches 2024-07-11 12:33:19 -07:00
Chris Penner
4c89423ef1 Rerun transcripts 2024-07-05 17:11:22 -07:00
Chris Penner
7dbb365a12 Convert diff-namespaces.md to project-root 2024-07-02 10:28:59 -07:00
Chris Penner
b636068ebd Partially update diff-namespace 2024-07-01 23:35:58 -07:00
Mitchell Rosen
831c2e0e06 in diff-namespace.md, replace uses of merge.old with debug.alias.term.force 2024-06-27 11:30:17 -04:00
Mitchell Rosen
596cb39b2e port empty namespace merge test to new merge 2024-06-26 12:13:18 -04:00
Mitchell Rosen
1442dc02ac fix up a couple transcripts 2024-05-24 11:08:44 -04:00
Mitchell Rosen
831005eaf3 ⅄ trunk → topic/merge4 2024-05-01 13:26:43 -04:00
Arya Irani
2cf96a36ae
deprecate cd, up; add find-in (#4883) 
* deprecate `cd`, `up`, hide `reset-root`, add `find-in`, hides unimplemented `update.builtins`
Co-authored-by: Chris Penner <christopher.penner@gmail.com>
 2024-04-28 21:30:02 -04:00
Mitchell Rosen
d37bce3e7e rename and hide old merge commands 2024-04-24 12:29:15 -04:00
Chris Penner
e50f57f542 Merge remote-tracking branch 'origin/trunk' into cp/remove-global-names-again 2024-01-08 13:42:00 -08:00
Chris Penner
fb6940c1c4 remove mergeio 2024-01-08 12:07:00 -08:00
Mitchell Rosen
b7d43cf40f remove a bunch of metadata-related code 2024-01-03 20:44:55 -05:00
Travis Staton
ab072c7960
fix transcripts 2023-11-08 11:54:50 -05:00
Paul Chiusano
375976b620 refresh diff-namespace.md 2023-07-24 13:52:24 -04:00
Travis Staton
745ed7929f update transcripts 2022-12-07 14:46:32 -05:00
Mitchell Rosen
7619f33921 update diff-namespace.md transcript 2022-08-31 14:23:50 -04:00
Paul Chiusano
4284f12897 fix up transcripts 2022-04-06 16:12:07 -05:00
Chris Penner
e70c072bb1 Refresh transcripts with history numbering 2022-02-08 15:12:00 -06:00
Chris Penner
7a5f742bde Revert "Make SBH toText and toString consistent with Unison.ShortHash" 
This reverts commit 68f44a4dd5.
 2021-11-29 13:39:32 -06:00
Chris Penner
fea12ee786 Merge branch 'trunk' into cp/diff-namespace-hashes 2021-11-29 10:26:54 -06:00
Chris Penner
68f44a4dd5 Make SBH toText and toString consistent with Unison.ShortHash 
Adds a new toBase32Hex for clarity
 2021-11-29 09:41:55 -06:00
Chris Penner
e09b587dae Add namespace hash diffing to transcript 2021-11-24 10:42:51 -06:00