2 4408b20f 2021-08-26 stsp - Add support for creating merge commits. This should move the work tree
3 4408b20f 2021-08-26 stsp onto a temporary branch like rebase and histedit do, recording commit
4 4408b20f 2021-08-26 stsp IDs and such in refs/got/merge/ as needed to keep state.
5 4408b20f 2021-08-26 stsp Bonus points for being able to merge an arbitrary tree into an arbitrary
6 4408b20f 2021-08-26 stsp subdirectory of the work tree. This would be required for merging vendor
7 4408b20f 2021-08-26 stsp branches. Say you have a branch 'llvm-12' which intially contains a 12.0
8 4408b20f 2021-08-26 stsp release tree as published by the LLVM project, added to the repository
9 4408b20f 2021-08-26 stsp with a command such as 'got import -b llvm-12'. On the main branch we
10 4408b20f 2021-08-26 stsp would want to merge files from the llvm-12 branch into /usr/src/gnu/llvm
11 4408b20f 2021-08-26 stsp instead of the root directory checked out at /usr/src.
12 4408b20f 2021-08-26 stsp The next LLVM release 12.1 would later be committed onto the llvm-12
13 4408b20f 2021-08-26 stsp branch and then merged into main at /usr/src/gnu/llvm in the same way.
16 06018813 2021-09-24 thomas - add http(s) transport with libtls in dial.c, speaking Git's HTTP protocol
17 06018813 2021-09-24 thomas via got-fetch-pack or a new helper
20 54f77e21 2019-01-06 stsp - implement horizonal scrolling in all views
21 54f77e21 2019-01-06 stsp - implement horizonal split view mode
22 5a5bf2ac 2019-06-25 stsp - implement 'limit' for 'tog log' (like search but display matched commits only)
23 72640c6b 2019-03-07 stsp - allow moving to prev/next blamed line in diff view if opened from blame view,
24 72640c6b 2019-03-07 stsp similar to how the diff view can switch commits if opened from log view
27 1b99d152 2020-11-16 stsp - tracey has a gotwebd thingy in progress somewhere
30 4408b20f 2021-08-26 stsp - needs to be designed and implemented
