Commit Diff

Commit:
b7dad73f266193a1be8d309a4e712b49199f55ad
From:
James Cook <falsifian@falsifian.org>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
remove 'got merge -M' todo item
Actions:
Patch | Tree
commit - 87c986b7f0d0e0e057ff53e14386faeac395878c
commit + b7dad73f266193a1be8d309a4e712b49199f55ad
blob - 1f7297bf2a0f12c2fbcce5fbb38a533d88f94d4e
blob + 12c274d421677eff9a42c38aee350a5a550b90b6
--- TODO
+++ TODO
@@ -8,9 +8,6 @@ got:
   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.
-- Provide an option (-M) to 'got merge' which forces creation of a merge commit
-  even when forwarding is possible, for cases where users deem forwarding
-  undesirable.
 - When a clone fails the HEAD symref will always point to "refs/heads/main"
   (ie. the internal default HEAD symref of Got). Resuming a failed clone with
   'got fetch' is supposed to work. To make this easier, if the HEAD symref