commit - fd44090b628aa7213949d0e8bcc696bf651aaa91
commit + 4408b20f8eddc1e1e4f3c865b8b59895590c0778
blob - bb206b431391a4ebf270341644f213b4d01268eb
blob + a5c4e9033f955ff0219be68c0949ba797f4f4675
--- TODO
+++ TODO
@@ -1,9 +1,19 @@
-lib:
-- create pack file deltas
+got:
+- Add support for creating merge commits. This should move the work tree
+  onto a temporary branch like rebase and histedit do, recording commit
+  IDs and such in refs/got/merge/ as needed to keep state.
+  Bonus points for being able to merge an arbitrary tree into an arbitrary
+  subdirectory of the work tree. This would be required for merging vendor
+  branches. Say you have a branch 'llvm-12' which intially contains a 12.0
+  release tree as published by the LLVM project, added to the repository
+  with a command such as 'got import -b llvm-12'. On the main branch we
+  would want to merge files from the llvm-12 branch into /usr/src/gnu/llvm
+  instead of the root directory checked out at /usr/src.
+  The next LLVM release 12.1 would later be committed onto the llvm-12
+  branch and then merged into main at /usr/src/gnu/llvm in the same way.
 
 libexec:
 - add http(s) transport with libtls in got-fetch-pack or a new helper
-- implement got-send-pack in order to push objects to servers
 
 tog:
 - implement horizonal scrolling in all views
@@ -14,3 +24,6 @@ tog:
 
 gotweb:
 - tracey has a gotwebd thingy in progress somewhere
+
+gotd:
+- needs to be designed and implemented