Commit Graph

2891 Commits

Author SHA1 Message Date
Chris Penner
49258bc343 Merge trunk 2024-07-05 16:55:07 -07:00
Arya Irani
293b4a2948
Merge pull request #5182 from unisonweb/cp/improve-lsp-completion 2024-07-05 15:59:13 -04:00
Arya Irani
8be432be1b change a punctuation 2024-07-05 15:10:28 -04:00
Chris Penner
deaf355f83 Improve LSP completion sorting 2024-07-05 11:56:31 -07:00
Greg Pfeil
0e76597e51
Merge remote-tracking branch 'upstream/trunk' into better-CLI-error-messages 2024-07-05 11:43:33 -06:00
Greg Pfeil
a7f1c24b57
Update transcript outputs 2024-07-05 11:28:27 -06:00
Arya Irani
38a73da600 switch Left to Right on help outputs; add draft transcripts 2024-07-05 11:33:11 -04:00
Chris Penner
8a405e02d2 Update reflog command WIP 2024-07-03 16:43:34 -07:00
Chris Penner
a7820feeac Deprecate root reflog behaviour in favour of project/branch reflogs 2024-07-03 11:52:52 -07:00
Chris Penner
1dab376523 Fix behaviour of deleting last project or branch 2024-07-03 11:21:59 -07:00
Chris Penner
2331c16770 Mostly Fix up deleting the branch you're on 2024-07-02 15:36:53 -07:00
Chris Penner
e9f2aa3ec5 Un-ignore transcript-parser-commands.md and fix it. 2024-07-02 15:36:53 -07:00
Chris Penner
5c675df566 Revive ability to delete root namespace 2024-07-02 10:53:28 -07:00
Chris Penner
7dbb365a12 Convert diff-namespaces.md to project-root 2024-07-02 10:28:59 -07:00
Chris Penner
478545e76a Rewrite view.md, still failing 2024-07-02 09:52:20 -07:00
Chris Penner
c0950036f0 Fix up tab-completion transcripts for project roots 2024-07-02 09:49:05 -07:00
Chris Penner
9af023b8ba Fixup resolution-failures.md 2024-07-02 09:48:07 -07:00
Chris Penner
498e898e0f Update namespace-dependencies 2024-07-02 09:41:39 -07:00
Chris Penner
e66b315c94 Partially translate names.md 2024-07-02 09:38:57 -07:00
Chris Penner
55ad236ac7 Update name-selection transcript 2024-07-02 09:35:24 -07:00
Chris Penner
983fb054bd Port move-namespace to projects 2024-07-01 23:48:22 -07:00
Chris Penner
6f19a87497 Update merge.md and fix5129 2024-07-01 23:41:02 -07:00
Chris Penner
b636068ebd Partially update diff-namespace 2024-07-01 23:35:58 -07:00
Chris Penner
081f344578 Fix delete.md 2024-07-01 22:21:14 -07:00
Chris Penner
fbd7bb90a6 Update 'bug-strange-closure.md' 2024-07-01 22:14:16 -07:00
Chris Penner
d93b5dee4f Update paths in branch-relative-path.md 2024-07-01 22:12:00 -07:00
Chris Penner
724dea4f19 Update api transcripts 2024-07-01 14:30:55 -07:00
Chris Penner
5f78557170 Solve conflicts 2024-07-01 14:30:55 -07:00
Chris Penner
fce12cb8b7 Work on fixing some transcripts for projects 2024-07-01 14:30:21 -07:00
Chris Penner
0b8548f36c Delete some out of date bits of transcripts 2024-07-01 14:29:32 -07:00
Chris Penner
dadc4e476b Merge trunk and resolve basic conflicts 2024-07-01 14:29:32 -07:00
Chris Penner
d98b4aebc1 Port more transcripts to projects 2024-07-01 11:14:31 -07:00
Arya Irani
71eed210ce
Merge pull request #5146 from unisonweb/24-06-26-port-old-merge-transcripts 2024-06-28 03:45:57 -04:00
Arya Irani
05585090c3
Merge pull request #5147 from unisonweb/todo-empty 2024-06-28 00:48:44 -04:00
Dan Doel
907aba9550 Rerun jit tests with regenerated file 2024-06-27 17:21:42 -04:00
Dan Doel
8a04bf4f87 Merge remote-tracking branch 'origin/trunk' into topic/jit-cont 2024-06-27 16:21:25 -04:00
Mitchell Rosen
a76bca1326 re-run fix2254.md 2024-06-27 15:43:07 -04:00
Mitchell Rosen
7fd9b6507d ⅄ trunk → todo-empty 2024-06-27 15:42:56 -04:00
Mitchell Rosen
ce3c2dcb94 don't output nothing when there's nothing to do 2024-06-27 14:56:32 -04:00
Chris Penner
937ac50e0a Don't pull base in docs.to-html 2024-06-27 11:29:00 -07:00
Dan Doel
658d490b25 Transcript update 2024-06-27 14:18:09 -04:00
Chris Penner
4b7cf99df6 Fix fix5080 pulling over the network 2024-06-27 11:08:05 -07:00
Chris Penner
b6b2adb075 Resolve merge conflicts with trunk 2024-06-27 10:55:45 -07:00
Chris Penner
384083e190 Revive strangely deleted bits of merge.md 2024-06-27 10:30:48 -07:00
Chris Penner
47a3a01fbe Fix up api transcripts 2024-06-27 10:25:16 -07:00
Dan Doel
c1bd940ce1 Bump share dependency 2024-06-27 12:28:39 -04:00
Mitchell Rosen
d1f2d78638 in update-on-conflict.md, replace use of merge.old with debug.alias.term.force 2024-06-27 11:44:46 -04:00
Mitchell Rosen
d9618f7ab3 in name-selection.md, replace use of merge.old with debug.alias.term.force 2024-06-27 11:41:25 -04: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
df9e78138f in delete.md, replace uses of merge.old with debug.alias.{term,type}.force 2024-06-27 11:12:21 -04:00